summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Request fewer historical notifications.Daniel Sandler2013-02-271-1/+1
| | | | | Bug: 8280039 Change-Id: I1cf2f96d0f159f58fc61572e78ea33f1c49cfed9
* Merge "Fix Android Beam toggle switch on Manta." into jb-mr2-devMartijn Coenen2013-02-261-15/+21
|\
| * Fix Android Beam toggle switch on Manta.Martijn Coenen2013-02-261-15/+21
| | | | | | | | | | Bug: 7974617 Change-Id: I9200c070a13415b5c0ca545211a31b3e9c544cac
* | Merge "App ops: add operations for reading/writing clipboard." into jb-mr2-devDianne Hackborn2013-02-262-2/+10
|\ \
| * | App ops: add operations for reading/writing clipboard.Dianne Hackborn2013-02-252-2/+10
| |/ | | | | | | Change-Id: I253d2ae34d95c7afa47af3d122e715c251ff6590
* | Merge "Add non-rectangular clip debug setting" into jb-mr2-devRomain Guy2013-02-264-57/+113
|\ \
| * | Add non-rectangular clip debug settingRomain Guy2013-02-254-57/+113
| |/ | | | | | | | | | | | | | | This change also reorganizes settings a little bit. A new section called "Hardware accelerated rendering" now hosts all the 2D/GPU related settings. Change-Id: Ife2d466b94d69310c2056c3dcf5c13737319f989
* | Respect user restriction against toggling location sharing settings.Maggie Benthall2013-02-252-11/+38
|/ | | | Change-Id: I1e629129fc9b3b224d4f4402b56d904df9edc43f
* Merge "Apply the show_password checkbox on the text field on orientation ↵Amith Yamasani2013-02-251-10/+25
|\ | | | | | | changes"
| * Apply the show_password checkbox on the text field on orientation changesAmith Yamasani2013-02-241-10/+25
| | | | | | | | | | | | | | | | Watch for changes to the checked state and update the password field's input type. Bug: 5639618 Change-Id: I4448d888481e5488289692fdf81901410cef72aa
* | Rename in-progress app ops UI.Dianne Hackborn2013-02-221-1/+1
|/ | | | | | Don't want to over-sell it. Change-Id: I09487574e705545a5eb7fd38f6116a0fac361388
* Merge "Import translations. DO NOT MERGE"Baligh Uddin2013-02-222-7/+7
|\
| * Import translations. DO NOT MERGEBaligh Uddin2013-02-222-7/+7
| | | | | | | | | | Change-Id: Ib9b4da5b511a114dde1de611dd86a20f7d22ede0 Auto-generated-cl: translation import
* | Merge "Clean up scan handling"Irfan Sheriff2013-02-221-1/+1
|\ \
| * | Clean up scan handlingIrfan Sheriff2013-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | use regular scan API instead of obsolete active scan API Bug: 8158647 Change-Id: I8f70e19219ad789b7501a40529bcd6b6524739e8
* | | 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
| |/ | | | | | | | | | | #proguaaaaaaaaard Change-Id: Ifdc7370f93dc4bbdfedc7be35534d5f2ccda3bad
* | 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
| | | | | | | | | | | | | | | | | | Also show lockdown VPN dialog whenever relaunched. Change-Id: Ib8aecbd4a7f9d61906f65fee39f1e819c79aabb4
* | | am a7d2fd80: Merge "avoid stopping app in case of accessing empty db"Wink Saville2013-02-211-35/+37
|\ \ \ | | | | | | | | | | | | | | | | * commit 'a7d2fd80c2f698d46548f949a2988f5f6d30af3d': avoid stopping app in case of accessing empty db
| * \ \ 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing empty database, Setting App is stopped, sometimes. To avoid stopping app, check null for cursor Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7304957 Change-Id: I3894f6fc9ae1aef92bff328006601af518111983
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RadioInfo was importing DataConnection and GsmDataConnection causing it to break. As it turns out it isn't using them so I removed them and all other unused imports. Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2
* | | | | | Improve notification UI for lockdown VPN.Jeff Sharkey2013-02-211-0/+8
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | Bug: 7064111 Change-Id: I951c1c116d2e0e22d1b32194d38f1431e806cbca
* | | | | Add explicit userId to AppWidget binder callsJim Miller2013-02-201-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyguard currently relies on being in the system process to grab the given user's widgets. When we split keyguard into a new process, it will need to have access to user-specific info to instantiate a specific user's widgets. In order to accomplish this, we add an explicit userid to each binder call as well as new permission check to allow keyguard access. This also fixes a potential race condition of having an incorrect user id due to an async call to change the user. Every binder call now has a specific user id. The user id is either the calling process user's id or an explicit one passed by applications like keyguard. It is created once when an AppWidgetManager is instantiated and remains for the lifetime of the object. Change-Id: Iec767fb399677b3cf2f9c0993e06b49951eb1f66
* | | | | 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
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 8156190 Change-Id: I120398e33cfbbce001a528de04d62cc92fe2f9d9
* | | | | am a5f756c9: Merge "Prevent cursor from causing global reference leaks."Amith Yamasani2013-02-201-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'a5f756c9e66ee81585ba81d13a8e13f809bdd875': Prevent cursor from causing global reference leaks.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To fix this the ContentQueryMap needs to be closed when onStop is called so any global references can be reclaimed. Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b7f1ae117401747d1788a0b009f36388cc2f4eb
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-195-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51826906358134f3ea734f0c35af1dfce10f4530 Auto-generated-cl: translation import
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the flashes in name and icon in Battery usage screen when refreshing. Bug: 8219466 Some earlier refactoring must have messed up the cache's scope. It will now avoid reloading name and icon if already present in the cache. Change-Id: I99c1f14dd53828dcb74cf12c02c47628e2e64d30
* | | | | | am ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029Irfan Sheriff2013-02-150-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ff5b96fb19e3a56a8803547a0c9cd11cfd97746c': Use updated enterprise API Fix EAP field display for a new network Allow only valid EAP configs Update enterprise API usage
| * | | | | Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029Irfan Sheriff2013-02-154-105/+220
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Use updated enterprise API Fix EAP field display for a new network Allow only valid EAP configs Update enterprise API usage
| | * | | | | Use updated enterprise APIIrfan Sheriff2013-02-151-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
| | * | | | | Fix EAP field display for a new networkIrfan Sheriff2013-02-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now hide certain EAP fields based on the type chosen. For a new network, we should set a default and handle this the same way Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
| | * | | | | Allow only valid EAP configsIrfan Sheriff2013-02-153-24/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow configuring all possible EAP fields today even though some of the configs make no sense and will not result in a successful connection. Allow only support configs for various EAP methods Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
| | * | | | | Update enterprise API usageIrfan Sheriff2013-02-152-88/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, remove the unnecessary keystore lock/unlock checks since these are now controlled at lockscreen Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
* | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-02-1552-10/+402
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4bb5b296199aa3d33d9e653e2f982e67178c3e7f Auto-generated-cl: translation import
* | | | | | am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"Amith Yamasani2013-02-151-2/+2
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | * commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23': Fix Settings app crash after enabled multi-user
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8128225 Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
* | | | | resolved conflicts for merge of bbe409d3 to masterKenny Root2013-02-142-3/+3
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | Change-Id: I5d64f8d628636f3621b765873aade25eca948576
| * | | Merge "KeyStore: stop using state()"Kenny Root2013-02-143-7/+5
| |\ \ \
generated by cgit v1.1 at 2025-08-09 19:55:51 +0000