summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Apply the show_password checkbox on the text field on orientation chan...Amith Yamasani2013-02-251-10/+25
|\
| * Apply the show_password checkbox on the text field on orientation changesAmith Yamasani2013-02-241-10/+25
* | Rename in-progress app ops UI.Dianne Hackborn2013-02-221-1/+1
|/
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-222-7/+7
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-02-222-7/+7
* | Merge "Clean up scan handling"Irfan Sheriff2013-02-221-1/+1
|\ \
| * | Clean up scan handlingIrfan Sheriff2013-02-211-1/+1
* | | Merge "Proguard fix: include notification settings fragment."Daniel Sandler2013-02-221-0/+1
|\ \ \ | |_|/ |/| |
| * | Proguard fix: include notification settings fragment.Daniel Sandler2013-02-221-0/+1
| |/
* | Merge "Explicit GridLayout alignment to fix warnings."Jeff Sharkey2013-02-217-13/+16
|\ \
| * | Explicit GridLayout alignment to fix warnings.Jeff Sharkey2013-02-217-13/+16
* | | am a7d2fd80: Merge "avoid stopping app in case of accessing empty db"Wink Saville2013-02-211-35/+37
|\ \ \
| * \ \ Merge "avoid stopping app in case of accessing empty db"Wink Saville2013-02-201-35/+37
| |\ \ \
| | * | | avoid stopping app in case of accessing empty dbHyejin Kim2013-02-161-35/+37
* | | | | Merge "Update Settings app to use new brightness dialog"Michael Wright2013-02-213-370/+8
|\ \ \ \ \
| * | | | | Update Settings app to use new brightness dialogMichael Wright2013-02-203-370/+8
* | | | | | Merge "Move DataConnection related classes to their own package."Wink Saville2013-02-211-10/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Move DataConnection related classes to their own package.Wink Saville2013-02-211-10/+0
* | | | | | Improve notification UI for lockdown VPN.Jeff Sharkey2013-02-211-0/+8
| |_|_|_|/ |/| | | |
* | | | | Add explicit userId to AppWidget binder callsJim Miller2013-02-201-2/+6
* | | | | Merge "Give Wi-Fi Display settings split actionbar."Jeff Sharkey2013-02-202-0/+3
|\ \ \ \ \
| * | | | | Give Wi-Fi Display settings split actionbar.Jeff Sharkey2013-02-202-0/+3
| | |/ / / | |/| | |
* | | | | am a5f756c9: Merge "Prevent cursor from causing global reference leaks."Amith Yamasani2013-02-201-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Prevent cursor from causing global reference leaks."Amith Yamasani2013-02-201-0/+1
| |\ \ \ \
| | * | | | Prevent cursor from causing global reference leaks.Per Allard2013-02-011-0/+1
* | | | | | Merge "Update notification list when notifications are posted."Daniel Sandler2013-02-201-14/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update notification list when notifications are posted.Daniel Sandler2013-02-141-14/+21
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-195-10/+10
* | | | | | Merge "Actually use the cache for names and icons."Amith Yamasani2013-02-192-4/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Actually use the cache for names and icons.Amith Yamasani2013-02-192-4/+7
* | | | | | am ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029Irfan Sheriff2013-02-150-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029Irfan Sheriff2013-02-154-105/+220
| |\ \ \ \ \
| | * | | | | Use updated enterprise APIIrfan Sheriff2013-02-151-9/+9
| | * | | | | Fix EAP field display for a new networkIrfan Sheriff2013-02-151-0/+5
| | * | | | | Allow only valid EAP configsIrfan Sheriff2013-02-153-24/+197
| | * | | | | Update enterprise API usageIrfan Sheriff2013-02-152-88/+25
| |/ / / / /
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-1552-10/+402
* | | | | | am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"Amith Yamasani2013-02-151-2/+2
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | Merge "Fix Settings app crash after enabled multi-user"Amith Yamasani2013-02-151-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix Settings app crash after enabled multi-userJaewan Kim2013-02-041-2/+2
* | | | | resolved conflicts for merge of bbe409d3 to masterKenny Root2013-02-142-3/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | Merge "KeyStore: stop using state()"Kenny Root2013-02-143-7/+5
| |\ \ \
| | * | | KeyStore: stop using state()Kenny Root2013-02-143-7/+5
| |/ / /
* | | | App ops: new labels, fix crash, fix updating list.Dianne Hackborn2013-02-133-20/+33
* | | | Merge "Use updated enterprise API"Irfan Sheriff2013-02-121-9/+9
|\ \ \ \
| * | | | Use updated enterprise APIIrfan Sheriff2013-02-121-9/+9
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-126-19/+19
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-126-19/+19
| |/ / / /
* | | | | Show the user's list of notifications in Settings.Daniel Sandler2013-02-1210-0/+550
|/ / / /
* | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-1136-104/+1848