OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 45308ef2: am 30c50b15: Use correct API for badging
Amith Yamasani [Mon, 15 Sep 2014 23:55:42 +0000 (23:55 +0000)]
am 45308ef2: am 30c50b15: Use correct API for badging

* commit '45308ef25d6b10f0a96bb32bfca1bdc6bb63725d':

9 years agoam 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:41 +0000 (23:55 +0000)]
am 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev

* commit '17f556c7081e911268d5f9ed6bdc349b6ace6c65':

9 years agoam 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialo...
PauloftheWest [Mon, 15 Sep 2014 23:55:40 +0000 (23:55 +0000)]
am 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev

* commit '5437b488cb39538c2685013c0afc5ef798d3847e':

9 years agoam 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activit...
Barnaby James [Mon, 15 Sep 2014 23:55:39 +0000 (23:55 +0000)]
am 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev

* commit '1299446dee8d928ade9d3b7f2e433dbcf153551e':

9 years agoam ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev
Amith Yamasani [Mon, 15 Sep 2014 23:55:38 +0000 (23:55 +0000)]
am ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev

* commit 'ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':

9 years agoam 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment...
Svetoslav [Mon, 15 Sep 2014 23:55:37 +0000 (23:55 +0000)]
am 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev

* commit '9b8912dbee4b0acd6e7cfd8920e018695074a39e':

9 years agoam 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev
Svetoslav [Mon, 15 Sep 2014 23:55:36 +0000 (23:55 +0000)]
am 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev

* commit '3c0385e46506ecbd8694f10bc041c53695a9e8bb':

9 years agoam 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern"...
Jorim Jaggi [Mon, 15 Sep 2014 23:55:35 +0000 (23:55 +0000)]
am 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev

* commit '60b7e88289651ce846e179f663964602f469f4b6':

9 years agoam da1e8c75: am 51712241: Fix typo in intent filter
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:34 +0000 (23:55 +0000)]
am da1e8c75: am 51712241: Fix typo in intent filter

* commit 'da1e8c75fb15821e073e6da09e7b897616232b0d':

9 years agoam 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon...
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]
am 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev

* commit '8378516b0bb4deefb68f30693f5bac2a3e1508ab':

9 years agoam 6f0507ad: am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
Dan Sandler [Mon, 15 Sep 2014 23:55:32 +0000 (23:55 +0000)]
am 6f0507ad: am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.

* commit '6f0507add78fe79212b8408651be74e59f7c9dfa':

9 years agoam 0e559d53: am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
Wink Saville [Mon, 15 Sep 2014 23:55:31 +0000 (23:55 +0000)]
am 0e559d53: am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev

* commit '0e559d532c7cce810caa06ec6b69638e608b5998':

9 years agoam a1c6288b: am 0535ed55: Merge "Fix bug #17393417 Developer Options are not indexed...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:30 +0000 (23:55 +0000)]
am a1c6288b: am 0535ed55: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev

* commit 'a1c6288b137e4babbf1da3bc3a573a106e7a939d':

9 years agoam 4cebc121: am 4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now...
PauloftheWest [Mon, 15 Sep 2014 23:55:29 +0000 (23:55 +0000)]
am 4cebc121: am 4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev

* commit '4cebc121506129eda1a6222bc19469956256643d':

9 years agoam 2ed0ea21: am 0a59607e: Merge "Implement per-app sensitivity settings toggle."...
Chris Wren [Mon, 15 Sep 2014 23:55:28 +0000 (23:55 +0000)]
am 2ed0ea21: am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev

* commit '2ed0ea2120d8356126f614655701382d1bf2a0fb':

9 years agoam f475cfa3: am ed1175cf: Merge "Increase the delay for the Search result Ripple...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:27 +0000 (23:55 +0000)]
am f475cfa3: am ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev

* commit 'f475cfa354f478dd8ad5779ce9e04c551e4bc3ed':

9 years agoam db9745e4: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
Andres Morales [Mon, 15 Sep 2014 23:55:26 +0000 (23:55 +0000)]
am db9745e4: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev

* commit 'db9745e43a416afb6a52ff89013c2353c812faee':

9 years agoam d5723235: am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
Andres Morales [Mon, 15 Sep 2014 23:55:25 +0000 (23:55 +0000)]
am d5723235: am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev

* commit 'd572323580c0eabb59e9d63f4f3c58f1aa32c71b':

9 years agoam 19843ad1: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Mon, 15 Sep 2014 23:55:24 +0000 (23:55 +0000)]
am 19843ad1: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '19843ad15e5b461ffb061c2c9478054f4cde70da':

9 years agoam 184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Mon, 15 Sep 2014 23:55:23 +0000 (23:55 +0000)]
am 184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
  Import translations. DO NOT MERGE

9 years agoam 357e2826: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker...
PauloftheWest [Mon, 15 Sep 2014 23:55:22 +0000 (23:55 +0000)]
am 357e2826: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev

* commit '357e2826e166821e489607e9ae4006fed19cf57a':

9 years agoam 0410a1e3: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 23:55:21 +0000 (23:55 +0000)]
am 0410a1e3: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev

* commit '0410a1e327f5276cc600ebda87ee0983f94b3891':

9 years agoam e758df57: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:20 +0000 (23:55 +0000)]
am e758df57: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev

* commit 'e758df576a099920e00ec360267439b4a719c2ad':

9 years agoam dd95e098: am ee846f88: missing dep. Revert "Implement per-app sensitivity setting...
Chris Wren [Mon, 15 Sep 2014 23:55:19 +0000 (23:55 +0000)]
am dd95e098: am ee846f88: missing dep.  Revert "Implement per-app sensitivity settings toggle."

* commit 'dd95e098f4e2b8d361df19964ab1ca6701840882':

9 years agoam cec40645: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle."...
Chris Wren [Mon, 15 Sep 2014 23:55:19 +0000 (23:55 +0000)]
am cec40645: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev

* commit 'cec406455239e26056687813dbdefcd9ceafa783':

9 years agoam 84176e56: am feec34ce: Merge "Don\'t block notifications from system packages...
Dan Sandler [Mon, 15 Sep 2014 23:55:16 +0000 (23:55 +0000)]
am 84176e56: am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev

* commit '84176e5691055d416bc6770704b00f2925a98318':

9 years agoam 75b8535f: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into...
PauloftheWest [Mon, 15 Sep 2014 23:55:15 +0000 (23:55 +0000)]
am 75b8535f: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev

* commit '75b8535f7d7329e3b3bf2743987abae850795845':

9 years agoam 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control"...
Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:55:14 +0000 (23:55 +0000)]
am 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev

* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':

9 years agoam 4c035b8f: am 1e0ea452: Merge "Start activity for the correct user in Settings...
Zoltan Szatmary-Ban [Mon, 15 Sep 2014 23:55:13 +0000 (23:55 +0000)]
am 4c035b8f: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev

* commit '4c035b8fe4618322d0332b92e6bc4c6e1d8f8cfb':

9 years agoam c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile...
Alexandra Gherghina [Mon, 15 Sep 2014 23:55:07 +0000 (23:55 +0000)]
am c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev

* commit 'c24310c9638c972f7757b1f2356383730129fac6':

9 years agoam b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appea...
PauloftheWest [Mon, 15 Sep 2014 23:55:06 +0000 (23:55 +0000)]
am b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev

* commit 'b448ea3a338fa1c7149816d06c11cb0f7431e6bb':

9 years agoam 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:05 +0000 (23:55 +0000)]
am 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev

* commit '842feb896192353083c7d0d0e8be422dc9124a76':

9 years agoam 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settin...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:04 +0000 (23:55 +0000)]
am 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev

* commit '9786d300a1933d0d5716bc6aa6c9b56b6261bafb':

9 years agoam a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into...
Wink Saville [Mon, 15 Sep 2014 23:55:03 +0000 (23:55 +0000)]
am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev

* commit 'a535fcb5b3a3329d40214f9cf215c49b6b4719ad':

9 years agoam bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:55:02 +0000 (23:55 +0000)]
am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev

* commit 'bcd1ff97448f9b9c0dd31f20ab7f3f8108e36b8d':

9 years agoam 2f64d506: am b58b5127: Fix links to notification settings activities.
Dan Sandler [Mon, 15 Sep 2014 23:55:01 +0000 (23:55 +0000)]
am 2f64d506: am b58b5127: Fix links to notification settings activities.

* commit '2f64d506e0823a67d9985f25232ef4c17ac14082':

9 years agoam 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS...
Vinit Deshpande [Mon, 15 Sep 2014 23:55:00 +0000 (23:55 +0000)]
am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev

* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':

9 years agoam 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restriction...
Amith Yamasani [Mon, 15 Sep 2014 23:54:59 +0000 (23:54 +0000)]
am 12997ecd: am 99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev

* commit '12997ecd97f0a1c4bbcd187e5009be133af5a790':

9 years agoam 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings."...
PauloftheWest [Mon, 15 Sep 2014 23:54:58 +0000 (23:54 +0000)]
am 43454701: am ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev

* commit '43454701c670451dc92bf0ac9240366623c37577':

9 years agoam c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
Jason Monk [Mon, 15 Sep 2014 23:54:57 +0000 (23:54 +0000)]
am c8d9504e: am dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev

* commit 'c8d9504eea4f144ec99ad1ee3d5ca5ada2ca7792':

9 years agoam 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption...
Paul Lawrence [Mon, 15 Sep 2014 23:54:56 +0000 (23:54 +0000)]
am 8826a64a: am 1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev

* commit '8826a64a6cd4a44b55033557e5b4867bcf131e35':

9 years agoam 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
Maurice Lam [Mon, 15 Sep 2014 23:54:55 +0000 (23:54 +0000)]
am 8efe9278: am def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev

* commit '8efe92789ec32f7bf6f890d1196a152902212322':

9 years agoam 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings...
PauloftheWest [Mon, 15 Sep 2014 23:54:54 +0000 (23:54 +0000)]
am 9fef5db8: am bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev

* commit '9fef5db88e9f67bcf54e5c1668b7475f948fb948':

9 years agoam 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at...
Fabrice Di Meglio [Mon, 15 Sep 2014 23:54:53 +0000 (23:54 +0000)]
am 8bde623e: am de8c683f: Merge "Fix bug #17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev

* commit '8bde623e6574467e0417837ce98aee28674d9de2':

9 years agoam c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer...
Dan Sandler [Mon, 15 Sep 2014 23:54:53 +0000 (23:54 +0000)]
am c8c5091f: am 3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev

* commit 'c8c5091f2612f2e74eb678727da7fb1e80210de3':

9 years agoam a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
PauloftheWest [Mon, 15 Sep 2014 23:54:52 +0000 (23:54 +0000)]
am a8d4b005: am d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev

* commit 'a8d4b00508c6cfc975a47d956f2c460ef375c8cc':

9 years agoam 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Mon, 15 Sep 2014 23:54:50 +0000 (23:54 +0000)]
am 25728d22: (-s ours) am 48d3f0fd: (-s ours) Import translations. DO NOT MERGE

* commit '25728d220a3fa5cc40d20e436ca72f24a85a365c':

9 years agoam d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Baligh Uddin [Mon, 15 Sep 2014 23:54:48 +0000 (23:54 +0000)]
am d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'd7697f0f113536d65a811e8def4a2a2c4eae827a':
  Import translations. DO NOT MERGE

9 years agoam 98365869: ksd to lmp-sprout-dev
Wink Saville [Mon, 15 Sep 2014 23:54:47 +0000 (23:54 +0000)]
am 98365869: ksd to lmp-sprout-dev

* commit '983658696be22aa55dc5b37c666cedb8826ded83':
  ksd to lmp-sprout-dev

9 years agoam 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into...
Prem Kumar [Mon, 15 Sep 2014 00:15:04 +0000 (00:15 +0000)]
am 2ce54402: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev

* commit '2ce5440203684e064102ba3e7ce9bccec4a76610':
  Remove UI for Forget AP as a secondary user.

9 years agoam c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
Prem Kumar [Mon, 15 Sep 2014 00:00:25 +0000 (00:00 +0000)]
am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev

* commit 'c0deb7dac00b4fcbc64866042788e3247474538e':
  Remove UI for Forget AP as a secondary user.

9 years agoMerge "Remove UI for Forget AP as a secondary user." into lmp-dev
Prem Kumar [Sun, 14 Sep 2014 23:51:21 +0000 (23:51 +0000)]
Merge "Remove UI for Forget AP as a secondary user." into lmp-dev

9 years agoam 89147d72: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power...
John Spurlock [Sun, 14 Sep 2014 20:09:40 +0000 (20:09 +0000)]
am 89147d72: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev

* commit '89147d726b0f3c4e69f3028c8043f71c14bc6f81':
  Settings: Use new PowerManager call to set low power mode.

9 years agoam 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into...
John Spurlock [Sun, 14 Sep 2014 19:51:01 +0000 (19:51 +0000)]
am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev

* commit '2e205e9b4b16133b29efba91e67bee8f20a51a88':
  Settings: Use new PowerManager call to set low power mode.

9 years agoMerge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
John Spurlock [Sun, 14 Sep 2014 19:36:18 +0000 (19:36 +0000)]
Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev

9 years agoSettings: Use new PowerManager call to set low power mode.
John Spurlock [Sun, 14 Sep 2014 15:20:37 +0000 (11:20 -0400)]
Settings: Use new PowerManager call to set low power mode.

Bind the master switch to the power manager state instead
of directly to the single setting.

Depends on frameworks/base change:
  Ic030504c9cad9868a7137abbe837b170da37852b

Bug:17460535
Change-Id: I8c68735308f58fdc07d4f64e765e84286918be7a

9 years agoam d03caf70: am 3e71b197: Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 18:03:11 +0000 (18:03 +0000)]
am d03caf70: am 3e71b197: Renaming Telecomm to Telecom.

* commit 'd03caf70865f50f74db2613f9d0c68ee50e22190':
  Renaming Telecomm to Telecom.

9 years agoam 3e71b197: Renaming Telecomm to Telecom.
Tyler Gunn [Sat, 13 Sep 2014 17:47:28 +0000 (17:47 +0000)]
am 3e71b197: Renaming Telecomm to Telecom.

* commit '3e71b197f7f85c5045a083ecc532954958807be6':
  Renaming Telecomm to Telecom.

9 years agoRenaming Telecomm to Telecom.
Tyler Gunn [Wed, 10 Sep 2014 22:21:33 +0000 (15:21 -0700)]
Renaming Telecomm to Telecom.

- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: Ia6e2d082eac1c1f306da691e95dd9bfb9afd37eb

9 years agoam dbb4a6b7: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot"...
Paul Lawrence [Fri, 12 Sep 2014 23:22:13 +0000 (23:22 +0000)]
am dbb4a6b7: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev

* commit 'dbb4a6b704e8feaba5f31623c66ee30fef8af680':
  Prevent PIN/Passwword disappearing during boot

9 years agoam c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
Paul Lawrence [Fri, 12 Sep 2014 22:05:22 +0000 (22:05 +0000)]
am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev

* commit 'c64c9808b9ba74063f0a59e3b7b11e4c3d15680a':
  Prevent PIN/Passwword disappearing during boot

9 years agoMerge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
Paul Lawrence [Fri, 12 Sep 2014 21:44:48 +0000 (21:44 +0000)]
Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev

9 years agoam f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 20:02:39 +0000 (20:02 +0000)]
am f57f94e9: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev

* commit 'f57f94e973b9fba78d08301568b109d983d0b425':
  Fix crash when showing accounts.

9 years agoam db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 19:37:38 +0000 (19:37 +0000)]
am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev

* commit 'db9e3f682fd251a9c996141af73b285974dd9d1c':
  Fix crash when showing accounts.

9 years agoPrevent PIN/Passwword disappearing during boot
Paul Lawrence [Wed, 14 May 2014 20:57:06 +0000 (13:57 -0700)]
Prevent PIN/Passwword disappearing during boot

During startup, when the telephony service starts, a configChange is sent
to the CryptKeeper activity, causing it to lose its data.

Ignore this change since it is immaterial to what we display.

Bug: 17421115

Change-Id: I83f867f3de5d90ff1050e3906da142d99fd6c276

9 years agoMerge "Fix crash when showing accounts." into lmp-dev
Kenny Guy [Fri, 12 Sep 2014 19:17:09 +0000 (19:17 +0000)]
Merge "Fix crash when showing accounts." into lmp-dev

9 years agoam 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons"...
Alexandra Gherghina [Fri, 12 Sep 2014 18:53:19 +0000 (18:53 +0000)]
am 0bf3dc02: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev

* commit '0bf3dc02ce5fa69271ba993b3d2ed0689c292002':
  Switch to using system-wide default user icons

9 years agoam 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into...
PauloftheWest [Fri, 12 Sep 2014 18:53:18 +0000 (18:53 +0000)]
am 7f7aa9dc: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev

* commit '7f7aa9dc60602298218cc573e8d30db222bb4442':
  Fixed multiple Bluetooth Settings crashes.

9 years agoFix crash when showing accounts.
Kenny Guy [Fri, 12 Sep 2014 18:49:11 +0000 (19:49 +0100)]
Fix crash when showing accounts.

Accounts page crashed when showing a disabled
manged profile.

Bug: 17486462
Change-Id: Iaaef23e135ee723bcf0d3101d85f9f0422b64c33

9 years agoam f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
Alexandra Gherghina [Fri, 12 Sep 2014 17:31:21 +0000 (17:31 +0000)]
am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev

* commit 'f738895dc06c5afd6c9525e49eaa50566580d8d6':
  Switch to using system-wide default user icons

9 years agoam 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
PauloftheWest [Fri, 12 Sep 2014 17:31:20 +0000 (17:31 +0000)]
am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev

* commit '37b1253a0195392c13661ad4504e8b8ef3af2ef4':
  Fixed multiple Bluetooth Settings crashes.

9 years agoMerge "Switch to using system-wide default user icons" into lmp-dev
Alexandra Gherghina [Fri, 12 Sep 2014 16:03:52 +0000 (16:03 +0000)]
Merge "Switch to using system-wide default user icons" into lmp-dev

9 years agoSwitch to using system-wide default user icons
Alexandra Gherghina [Wed, 3 Sep 2014 09:22:09 +0000 (10:22 +0100)]
Switch to using system-wide default user icons

User icons were either User Settings specific, or missing. This makes it
consistent with the ones in the new helper class.

Bug: 17311038
Change-Id: I20cc1deba989cf7a397c5a8dba41bd91bd62472b

9 years agoMerge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
PauloftheWest [Fri, 12 Sep 2014 13:06:41 +0000 (13:06 +0000)]
Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev

9 years agoam 901df0c3: am a5780340: Merge "Fix some things in settings: manage apps, battery...
Dianne Hackborn [Fri, 12 Sep 2014 05:48:45 +0000 (05:48 +0000)]
am 901df0c3: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev

* commit '901df0c3744e16d5a86e377583ea96d5a8b687dc':
  Fix some things in settings: manage apps, battery, procstats

9 years agoam 06157a11: am 85dcef12: Fix settings crash in print job screen.
Svetoslav [Fri, 12 Sep 2014 05:48:44 +0000 (05:48 +0000)]
am 06157a11: am 85dcef12: Fix settings crash in print job screen.

* commit '06157a11cd16116a04596235dfac139ae1fb01f8':
  Fix settings crash in print job screen.

9 years agoam a5780340: Merge "Fix some things in settings: manage apps, battery, procstats...
Dianne Hackborn [Fri, 12 Sep 2014 05:09:07 +0000 (05:09 +0000)]
am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev

* commit 'a5780340fcf8f8910f1aa1197c604be32ff6a5cf':
  Fix some things in settings: manage apps, battery, procstats

9 years agoam 85dcef12: Fix settings crash in print job screen.
Svetoslav [Fri, 12 Sep 2014 05:06:32 +0000 (05:06 +0000)]
am 85dcef12: Fix settings crash in print job screen.

* commit '85dcef12263f3cbae05240a155e92e7cf386d58f':
  Fix settings crash in print job screen.

9 years agoMerge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
Dianne Hackborn [Fri, 12 Sep 2014 02:24:16 +0000 (02:24 +0000)]
Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev

9 years agoFix some things in settings: manage apps, battery, procstats
Dianne Hackborn [Fri, 12 Sep 2014 01:09:29 +0000 (18:09 -0700)]
Fix some things in settings: manage apps, battery, procstats

Issue #17461567: java.lang.ArithmeticException: divide by zero when
looking at Settings > Battery

Yeah, let's not do that.

Issue #17365562: Running services RAM totals are wrong

Okay so like a few months ago, I had this vacation coming up, and
it was around the feature complete (hahah) deadline, and I had to
rush to get this in before I left.  So I rushed.  And, well, I forgot
a few things.  Here they are.  We now show the right numbers and
even update things correctly when you change what processes are
being shown.  Wow.

Finally, fixed a few issues in the dev tools procstats UI.

Change-Id: I8348a9c2ec3226a455c5c8465729e4487f324c8b

9 years agoFix settings crash in print job screen.
Svetoslav [Thu, 11 Sep 2014 21:30:13 +0000 (14:30 -0700)]
Fix settings crash in print job screen.

The code was looking up the print job from the print manager
based on the lifecycle event of the hosting fragment. There
was a case missing and the print job not initialized on
rotation. This change looks up the job lazily making the
code more robust.

bug:17471952

Change-Id: I00075e161f69ca711bac6857f5ec00c20b5b17a0

9 years agoFixed multiple Bluetooth Settings crashes.
PauloftheWest [Wed, 10 Sep 2014 13:45:00 +0000 (06:45 -0700)]
Fixed multiple Bluetooth Settings crashes.

+ Fixed a crash when selecting On/Off multiple times on an input device.
+ Fixed a crash when visiting different Bluetooth Settings after
disabling an input device.

Bug: 17402421
Change-Id: I23efa3a36ba8cf0df02cf41397586a10dae9e08c

9 years agoam 57bef54b: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for prote...
Vinit Deshpande [Thu, 11 Sep 2014 18:39:40 +0000 (18:39 +0000)]
am 57bef54b: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

* commit '57bef54befac21bc43aee60ba9ea8f5e1a6c039d':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts

9 years agoam a6e4db3c: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
Svetoslav [Thu, 11 Sep 2014 18:32:02 +0000 (18:32 +0000)]
am a6e4db3c: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

* commit 'a6e4db3ce090252e24bcbc5e7010a5cbd1b47c68':
  Fix print icons in settings.

9 years agoam 15fbbbc8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am...
Carlos Valdivia [Thu, 11 Sep 2014 18:32:01 +0000 (18:32 +0000)]
am 15fbbbc8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '15fbbbc8b142f110ec96994310505b81ba9c08ca':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcas...
Vinit Deshpande [Thu, 11 Sep 2014 18:25:06 +0000 (18:25 +0000)]
am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

* commit '0a11f60595a729e261b0dcfbbecca7e0ec8470ac':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts

9 years agoMerge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
Vinit Deshpande [Thu, 11 Sep 2014 18:16:59 +0000 (18:16 +0000)]
Merge "Don't require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

9 years agoam 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
Svetoslav [Thu, 11 Sep 2014 17:40:06 +0000 (17:40 +0000)]
am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
  Fix print icons in settings.

9 years agoam f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am...
Carlos Valdivia [Thu, 11 Sep 2014 17:40:03 +0000 (17:40 +0000)]
am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit 'f79797c8853741e80668f1d91c4d7d1a076bac18':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoMerge "Fix print icons in settings." into lmp-dev
Svetoslav [Thu, 11 Sep 2014 17:28:30 +0000 (17:28 +0000)]
Merge "Fix print icons in settings." into lmp-dev

9 years agoam ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am...
Carlos Valdivia [Thu, 11 Sep 2014 17:25:05 +0000 (17:25 +0000)]
am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit 'ea2fa0d98a9777e37815624bf3e4345b4c6df643':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURIT...
Carlos Valdivia [Thu, 11 Sep 2014 17:12:11 +0000 (17:12 +0000)]
am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit 'db591467f6ae0e082c0ce627874a851f1926d63a':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t...
Carlos Valdivia [Thu, 11 Sep 2014 17:05:31 +0000 (17:05 +0000)]
am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '737d2d538b81ee843192d229ef558e69f2a944a9':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable...
Carlos Valdivia [Thu, 11 Sep 2014 16:59:49 +0000 (16:59 +0000)]
am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '61ced6d4270b86c336520856cb1545865cb01107':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent...
Carlos Valdivia [Thu, 11 Sep 2014 16:49:32 +0000 (16:49 +0000)]
am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '01137c2004a617dae870f9c07b34a29f8706b615':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:42:54 +0000 (16:42 +0000)]
am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '663b4e9733e3c9dbfd2966f52edc2c7f7cff55c4':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
Carlos Valdivia [Thu, 11 Sep 2014 16:37:09 +0000 (16:37 +0000)]
am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.

* commit '37b58a420ff59254cbe9420c64685fdb7ea4e375':
  SECURITY: Don't pass a usable Pending Intent to 3rd parties.

9 years agoam 0d2c8d34: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Thu, 11 Sep 2014 16:04:14 +0000 (16:04 +0000)]
am 0d2c8d34: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '0d2c8d34d9f22c0e28682e87133d5dff63feb311':
  Import translations. DO NOT MERGE

9 years agoam 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 15:58:44 +0000 (15:58 +0000)]
am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '9b45212b1ddafd923bf785a754add5ac256ce624':
  Import translations. DO NOT MERGE

9 years agoMerge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 11 Sep 2014 15:49:25 +0000 (15:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev