OSDN Git Service

android-x86/packages-apps-Settings.git
10 years agoam 6be9bffa: am 88cf7709: Implement issue #10895990: Better durations for proc stats
Dianne Hackborn [Tue, 24 Sep 2013 17:24:53 +0000 (10:24 -0700)]
am 6be9bffa: am 88cf7709: Implement issue #10895990: Better durations for proc stats

* commit '6be9bffa6fb5ff3def3ed38dae61dc19f88c0185':
  Implement issue #10895990: Better durations for proc stats

10 years agoam 88cf7709: Implement issue #10895990: Better durations for proc stats
Dianne Hackborn [Tue, 24 Sep 2013 02:00:12 +0000 (19:00 -0700)]
am 88cf7709: Implement issue #10895990: Better durations for proc stats

* commit '88cf7709cb7ed829980cb8ddac3d5c7ac945d772':
  Implement issue #10895990: Better durations for proc stats

10 years agoImplement issue #10895990: Better durations for proc stats
Dianne Hackborn [Mon, 23 Sep 2013 22:02:13 +0000 (15:02 -0700)]
Implement issue #10895990: Better durations for proc stats

Add new option to select data duration to show, with the default
being 3 hours.

Reworked how menus are updated to remove redundant code.

Switch to using new proc stats service API for retrieving stats,
which is more efficient and won't hit IPC limits.

Fixed layout for details items to ellipsize long items.

Change-Id: I1a0f8a4adf8fc330c2639077323c6379d23ad987

10 years agoam 13323378: am 1efb1b52: Merge "Remove "Android System" from recent apps list in...
David Christie [Sat, 21 Sep 2013 18:08:09 +0000 (11:08 -0700)]
am 13323378: am 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev

* commit '133233780bac331d72bc6d40955ba65da9911541':
  Remove "Android System" from recent apps list in Settings (b/10855277)

10 years agoam 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b...
David Christie [Sat, 21 Sep 2013 16:35:41 +0000 (09:35 -0700)]
am 1efb1b52: Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev

* commit '1efb1b52d6901ca58104030e3b98512473bed7fb':
  Remove "Android System" from recent apps list in Settings (b/10855277)

10 years agoMerge "Remove "Android System" from recent apps list in Settings (b/10855277)" into...
David Christie [Sat, 21 Sep 2013 16:33:50 +0000 (16:33 +0000)]
Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev

10 years agoam a771964f: am 995e69d1: Merge "Offer to enable a print service after it is installe...
Svetoslav [Sat, 21 Sep 2013 01:20:26 +0000 (18:20 -0700)]
am a771964f: am 995e69d1: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev

* commit 'a771964fe63cfd3d4b8937f320e41f30461c5f57':
  Offer to enable a print service after it is installed (Settings).

10 years agoam 995e69d1: Merge "Offer to enable a print service after it is installed (Settings...
Svetoslav [Sat, 21 Sep 2013 01:18:32 +0000 (18:18 -0700)]
am 995e69d1: Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev

* commit '995e69d1e130d54b371e4278e90d508e025de9a2':
  Offer to enable a print service after it is installed (Settings).

10 years agoMerge "Offer to enable a print service after it is installed (Settings)." into klp-dev
Svetoslav [Sat, 21 Sep 2013 01:15:52 +0000 (01:15 +0000)]
Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev

10 years agoRemove "Android System" from recent apps list in Settings (b/10855277)
David Christie [Sat, 21 Sep 2013 00:50:55 +0000 (17:50 -0700)]
Remove "Android System" from recent apps list in Settings (b/10855277)

Change-Id: I22d74c22c482786298af088abb7b25c790fd4b21

10 years agoOffer to enable a print service after it is installed (Settings).
Svetoslav [Sat, 21 Sep 2013 00:25:22 +0000 (17:25 -0700)]
Offer to enable a print service after it is installed (Settings).

The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.

bug:10447510

Change-Id: Ibfb5368a09b1e012dd6dd0f3d33a5ad10e5ee00e

10 years agoam 1950047a: am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors...
Lifu Tang [Sat, 21 Sep 2013 00:14:28 +0000 (17:14 -0700)]
am 1950047a: am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev

* commit '1950047a32fcc3ebcec8adad81770cfd3060716b':
  Change "Device sensors only" to "Device sensors"

10 years agoam c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev
Lifu Tang [Sat, 21 Sep 2013 00:12:11 +0000 (17:12 -0700)]
am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into klp-dev

* commit 'c9ebf9bbad2eec84a68799a71a229d3198b49c73':
  Change "Device sensors only" to "Device sensors"

10 years agoMerge "Change "Device sensors only" to "Device sensors"" into klp-dev
Lifu Tang [Sat, 21 Sep 2013 00:10:11 +0000 (00:10 +0000)]
Merge "Change "Device sensors only" to "Device sensors"" into klp-dev

10 years agoChange "Device sensors only" to "Device sensors"
Lifu Tang [Fri, 20 Sep 2013 23:57:18 +0000 (16:57 -0700)]
Change "Device sensors only" to "Device sensors"

- Fix b/10856635

Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0

10 years agoam 41b18f71: am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up."...
David Braun [Fri, 20 Sep 2013 23:33:56 +0000 (16:33 -0700)]
am 41b18f71: am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev

* commit '41b18f71b20de45b3bf195bce3e7b0c85a1db124':
  Fix crash rotating with default SMS dialog up.

10 years agoam 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev
David Braun [Fri, 20 Sep 2013 23:31:23 +0000 (16:31 -0700)]
am 1a2bfad4: Merge "Fix crash rotating with default SMS dialog up." into klp-dev

* commit '1a2bfad4250cb231d60823affbb8288b6c6d1797':
  Fix crash rotating with default SMS dialog up.

10 years agoMerge "Fix crash rotating with default SMS dialog up." into klp-dev
David Braun [Fri, 20 Sep 2013 23:29:40 +0000 (23:29 +0000)]
Merge "Fix crash rotating with default SMS dialog up." into klp-dev

10 years agoFix crash rotating with default SMS dialog up.
David Braun [Fri, 20 Sep 2013 21:15:32 +0000 (14:15 -0700)]
Fix crash rotating with default SMS dialog up.

Bug: 10845396 NPE storage == null when user rotates device while setting up 'Default SMS app'
Change-Id: I9a19ede726caabe5e66b83951585380768b66be6

10 years agoam b3bc9337: am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
Elliott Hughes [Fri, 20 Sep 2013 20:51:04 +0000 (13:51 -0700)]
am b3bc9337: am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."

* commit 'b3bc9337161f13ac4a368f7acae50fe1c51af9af':
  Fix time zone formatting in RTL locales.

10 years agoam aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."
Elliott Hughes [Fri, 20 Sep 2013 20:47:58 +0000 (13:47 -0700)]
am aeb1fa77: am 10fdcab4: Merge "Fix time zone formatting in RTL locales."

* commit 'aeb1fa779ba781fc1decb68db387ee64df58befa':
  Fix time zone formatting in RTL locales.

10 years agoam 10fdcab4: Merge "Fix time zone formatting in RTL locales."
Elliott Hughes [Fri, 20 Sep 2013 20:46:04 +0000 (13:46 -0700)]
am 10fdcab4: Merge "Fix time zone formatting in RTL locales."

* commit '10fdcab4245ce1beeb75c36b36ccaa48bf8953f0':
  Fix time zone formatting in RTL locales.

10 years agoMerge "Fix time zone formatting in RTL locales."
Elliott Hughes [Fri, 20 Sep 2013 20:44:32 +0000 (20:44 +0000)]
Merge "Fix time zone formatting in RTL locales."

10 years agoam 2b130d78: am de105da5: Merge "Change string documentation for widget setting to...
Jim Miller [Fri, 20 Sep 2013 20:10:07 +0000 (13:10 -0700)]
am 2b130d78: am de105da5: Merge "Change string documentation for widget setting to be more clear." into klp-dev

* commit '2b130d786deb961c113b97dae136e0f8e6b47a8c':
  Change string documentation for widget setting to be more clear.

10 years agoam de105da5: Merge "Change string documentation for widget setting to be more clear...
Jim Miller [Fri, 20 Sep 2013 20:06:38 +0000 (13:06 -0700)]
am de105da5: Merge "Change string documentation for widget setting to be more clear." into klp-dev

* commit 'de105da5500477d216d226cc342811e335f8bcb4':
  Change string documentation for widget setting to be more clear.

10 years agoMerge "Change string documentation for widget setting to be more clear." into klp-dev
Jim Miller [Fri, 20 Sep 2013 20:03:51 +0000 (20:03 +0000)]
Merge "Change string documentation for widget setting to be more clear." into klp-dev

10 years agoChange string documentation for widget setting to be more clear.
Jim Miller [Fri, 20 Sep 2013 19:58:30 +0000 (12:58 -0700)]
Change string documentation for widget setting to be more clear.

Fixes bug 10505288

Change-Id: I6a375c710b77db845073fffa6ebf15c1cd262900

10 years agoam a9d1d90c: am d8f4eb50: Merge "wifi-display: mark certification strings as not...
Chong Zhang [Fri, 20 Sep 2013 18:22:25 +0000 (11:22 -0700)]
am a9d1d90c: am d8f4eb50: Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev

* commit 'a9d1d90c526e36f495de7f77a299863dc5761ccf':
  wifi-display: mark certification strings as not tranlatable

10 years agoam bc016eec: am 8243c9a7: Incorporate home metadata into app details UI
Christopher Tate [Fri, 20 Sep 2013 18:21:01 +0000 (11:21 -0700)]
am bc016eec: am 8243c9a7: Incorporate home metadata into app details UI

* commit 'bc016eec42ee8dd7e959ed40a3201ed126d0e260':
  Incorporate home metadata into app details UI

10 years agoam d8f4eb50: Merge "wifi-display: mark certification strings as not tranlatable"...
Chong Zhang [Fri, 20 Sep 2013 17:25:49 +0000 (10:25 -0700)]
am d8f4eb50: Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev

* commit 'd8f4eb50ba8efb4e38c41e00ef1a176b99cdda33':
  wifi-display: mark certification strings as not tranlatable

10 years agoMerge "wifi-display: mark certification strings as not tranlatable" into klp-dev
Chong Zhang [Fri, 20 Sep 2013 17:23:06 +0000 (17:23 +0000)]
Merge "wifi-display: mark certification strings as not tranlatable" into klp-dev

10 years agoam 430cb07d: am 6741d4db: Merge "Use META_HOME_ALTERNATE for home app uninstall targe...
Christopher Tate [Fri, 20 Sep 2013 16:58:15 +0000 (09:58 -0700)]
am 430cb07d: am 6741d4db: Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev

* commit '430cb07dd79a5534c7bbf301f123f2ee8bd966d8':
  Use META_HOME_ALTERNATE for home app uninstall target

10 years agowifi-display: mark certification strings as not tranlatable
Chong Zhang [Fri, 20 Sep 2013 01:24:32 +0000 (18:24 -0700)]
wifi-display: mark certification strings as not tranlatable

Bug: 10507614
Change-Id: I96557f48cb25bc767a3b4c7620a2312417018119

10 years agoam 8243c9a7: Incorporate home metadata into app details UI
Christopher Tate [Fri, 20 Sep 2013 00:59:06 +0000 (17:59 -0700)]
am 8243c9a7: Incorporate home metadata into app details UI

* commit '8243c9a722e815bdcb069163de48877478c28dfd':
  Incorporate home metadata into app details UI

10 years agoIncorporate home metadata into app details UI
Christopher Tate [Thu, 19 Sep 2013 21:59:17 +0000 (14:59 -0700)]
Incorporate home metadata into app details UI

Just as we don't expose disable/uninstall of home applications in this UI,
we now also don't allow disable/uninstall of packages that are proxying
for home apps via the android.app.home.alternate meta-data mechanism.

Also, don't display the 'Home' settings top-level category at all when
there is only a single available home app.

Finally, explicitly note the current user when sending broadcasts,
otherwise API sanity checks get suspicious.

Bug 10749961

Change-Id: I13e11032cb571df19798c4e13c91a572d1ee61a7

10 years agoam 6741d4db: Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev
Christopher Tate [Thu, 19 Sep 2013 19:48:16 +0000 (12:48 -0700)]
am 6741d4db: Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev

* commit '6741d4db7bc385f7c26909d356bf94494e900a46':
  Use META_HOME_ALTERNATE for home app uninstall target

10 years agoMerge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev
Christopher Tate [Thu, 19 Sep 2013 19:46:07 +0000 (19:46 +0000)]
Merge "Use META_HOME_ALTERNATE for home app uninstall target" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Thu, 19 Sep 2013 09:54:26 +0000 (02:54 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ic72a804da5471d03b12a22e526932195feab9ccf
Auto-generated-cl: translation import

10 years agoUse META_HOME_ALTERNATE for home app uninstall target
Christopher Tate [Thu, 19 Sep 2013 01:34:56 +0000 (18:34 -0700)]
Use META_HOME_ALTERNATE for home app uninstall target

So a bundled home app can proxy install/uninstall to a non-bundled
package cleanly.

Bug 10749961

Change-Id: Ia35663fc46c068fe17eafa9116b6dda34c124b04

10 years agoFix time zone formatting in RTL locales.
Elliott Hughes [Wed, 18 Sep 2013 22:04:25 +0000 (15:04 -0700)]
Fix time zone formatting in RTL locales.

This fixes ar, fa, and he/iw.

Bug: 10231161
Change-Id: I31acc044443c026ba8b8e1967810f7aa476bcae7

10 years agoam 5cfe03d0: (-s ours) am 43d8d440: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Sep 2013 21:44:32 +0000 (14:44 -0700)]
am 5cfe03d0: (-s ours) am 43d8d440: (-s ours) Import translations. DO NOT MERGE

* commit '5cfe03d0e36065abf009974fe952ede2b06ce7c2':
  Import translations. DO NOT MERGE

10 years agoam 43d8d440: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Sep 2013 21:42:09 +0000 (14:42 -0700)]
am 43d8d440: (-s ours) Import translations. DO NOT MERGE

* commit '43d8d440a826692fe5551c06a48318fd0a1092fb':
  Import translations. DO NOT MERGE

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 18 Sep 2013 21:26:53 +0000 (14:26 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7c84e43d9c5b44e9927994a8e6349666478d399d
Auto-generated-cl: translation import

10 years agoam 9773a014: am d810a6a5: Merge "Implement new method for handling SMS/MMS on the...
David Braun [Tue, 17 Sep 2013 22:21:42 +0000 (15:21 -0700)]
am 9773a014: am d810a6a5: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev

* commit '9773a014003201f9b629ebd69633f7904d909d32':
  Implement new method for handling SMS/MMS on the platform

10 years agoam d810a6a5: Merge "Implement new method for handling SMS/MMS on the platform" into...
David Braun [Tue, 17 Sep 2013 22:19:12 +0000 (15:19 -0700)]
am d810a6a5: Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev

* commit 'd810a6a59a44f9b5bde021dfa0e5507dc4ec0472':
  Implement new method for handling SMS/MMS on the platform

10 years agoMerge "Implement new method for handling SMS/MMS on the platform" into klp-dev
David Braun [Tue, 17 Sep 2013 22:15:13 +0000 (22:15 +0000)]
Merge "Implement new method for handling SMS/MMS on the platform" into klp-dev

10 years agoam f73e7284: (-s ours) am 84126461: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Tue, 17 Sep 2013 04:20:43 +0000 (21:20 -0700)]
am f73e7284: (-s ours) am 84126461: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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

10 years agoam 84126461: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:18:58 +0000 (21:18 -0700)]
am 84126461: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '841264618f0e1f31b33c428ad02ab5babba6a10c':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 17 Sep 2013 04:16:05 +0000 (04:16 +0000)]
Merge "Import translations. DO NOT MERGE"

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Tue, 17 Sep 2013 04:15:59 +0000 (04:15 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoam 8250d33a: am f48e4b5b: Merge "Don\'t crash on rotation when cropping a profile...
Amith Yamasani [Tue, 17 Sep 2013 00:12:25 +0000 (17:12 -0700)]
am 8250d33a: am f48e4b5b: Merge "Don\'t crash on rotation when cropping a profile picture" into klp-dev

* commit '8250d33ad44dc2a39e31337c428311fa2bb08b5a':
  Don't crash on rotation when cropping a profile picture

10 years agoam f48e4b5b: Merge "Don\'t crash on rotation when cropping a profile picture" into...
Amith Yamasani [Tue, 17 Sep 2013 00:09:46 +0000 (17:09 -0700)]
am f48e4b5b: Merge "Don\'t crash on rotation when cropping a profile picture" into klp-dev

* commit 'f48e4b5bf628f9422888a97653dd2156489c5352':
  Don't crash on rotation when cropping a profile picture

10 years agoMerge "Don't crash on rotation when cropping a profile picture" into klp-dev
Amith Yamasani [Tue, 17 Sep 2013 00:07:47 +0000 (00:07 +0000)]
Merge "Don't crash on rotation when cropping a profile picture" into klp-dev

10 years agoImplement new method for handling SMS/MMS on the platform
David Braun [Mon, 16 Sep 2013 20:45:42 +0000 (13:45 -0700)]
Implement new method for handling SMS/MMS on the platform

Multi project change:
The changes in this project update the settings app to support the new
default SMS app setting. I have also updated the order of the wireless
settings in the UX as per request from rachelg.

Bug: 10449618
Change-Id: Iba1ac6ea3f29c2a72af83b122ec5ea3a16a28e58

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:25:13 +0000 (12:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2ab06cc0b9600edc5489f799ed218eb50408980f
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 16 Sep 2013 19:20:03 +0000 (12:20 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id76027847101f7e17749c6c60863ec213bc6fff9
Auto-generated-cl: translation import

10 years agoam 96d315c7: am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev
Martijn Coenen [Mon, 16 Sep 2013 10:03:05 +0000 (03:03 -0700)]
am 96d315c7: am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev

* commit '96d315c7b7853fd62d6f1b35d040791ac43d5fe7':
  Payments: use latest settings icon.

10 years agoam 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev
Martijn Coenen [Mon, 16 Sep 2013 10:00:16 +0000 (03:00 -0700)]
am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-dev

* commit '77fbf0c7a43fff4cf427a31186d1ca8777895205':
  Payments: use latest settings icon.

10 years agoMerge "Payments: use latest settings icon." into klp-dev
Martijn Coenen [Mon, 16 Sep 2013 09:57:30 +0000 (09:57 +0000)]
Merge "Payments: use latest settings icon." into klp-dev

10 years agoam 882a5b3e: am 256e51d3: Merge "Ignore print service settings activities if they...
Svetoslav [Mon, 16 Sep 2013 00:21:54 +0000 (17:21 -0700)]
am 882a5b3e: am 256e51d3: Merge "Ignore print service settings activities if they are not exported." into klp-dev

* commit '882a5b3e60c764b9d5acef54e7eba20826760143':
  Ignore print service settings activities if they are not exported.

10 years agoam 256e51d3: Merge "Ignore print service settings activities if they are not exported...
Svetoslav [Mon, 16 Sep 2013 00:19:38 +0000 (17:19 -0700)]
am 256e51d3: Merge "Ignore print service settings activities if they are not exported." into klp-dev

* commit '256e51d328ac28594a6057de829190ffe4fa593f':
  Ignore print service settings activities if they are not exported.

10 years agoMerge "Ignore print service settings activities if they are not exported." into klp-dev
Svetoslav [Mon, 16 Sep 2013 00:16:56 +0000 (00:16 +0000)]
Merge "Ignore print service settings activities if they are not exported." into klp-dev

10 years agoam 18d6e016: am 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev
Dianne Hackborn [Mon, 16 Sep 2013 00:08:05 +0000 (17:08 -0700)]
am 18d6e016: am 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev

* commit '18d6e0164c4f1eccfce5fab064d84dec3bc6c745':
  Various proc stats UI improvements.

10 years agoam 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev
Dianne Hackborn [Mon, 16 Sep 2013 00:05:56 +0000 (17:05 -0700)]
am 2d29fad1: Merge "Various proc stats UI improvements." into klp-dev

* commit '2d29fad197c1fe17e5a61fb30944c5add989e7f1':
  Various proc stats UI improvements.

10 years agoMerge "Various proc stats UI improvements." into klp-dev
Dianne Hackborn [Mon, 16 Sep 2013 00:04:51 +0000 (00:04 +0000)]
Merge "Various proc stats UI improvements." into klp-dev

10 years agoVarious proc stats UI improvements.
Dianne Hackborn [Sun, 15 Sep 2013 20:22:28 +0000 (13:22 -0700)]
Various proc stats UI improvements.

- Option to include system processes.
- Option to use uss instead of pss sizes.
- Option to select type of stats: background processes, foreground (top)
  processes, cached processes.
- Details now shows max mem usage.

Change-Id: Ic994564ce846bc1021bf35576feeb9ef095b0e48

10 years agoam ae6067c4: am 8104ac0c: Merge "Update the action bar in settings." into klp-dev
Mindy Pereira [Sun, 15 Sep 2013 18:02:49 +0000 (11:02 -0700)]
am ae6067c4: am 8104ac0c: Merge "Update the action bar in settings." into klp-dev

* commit 'ae6067c4bd9e86ed8f4b48ec8c266c7d0caa822a':
  Update the action bar in settings.

10 years agoam 8104ac0c: Merge "Update the action bar in settings." into klp-dev
Mindy Pereira [Sun, 15 Sep 2013 18:01:29 +0000 (11:01 -0700)]
am 8104ac0c: Merge "Update the action bar in settings." into klp-dev

* commit '8104ac0c5135508cad8e203ad1936a0c08d555a9':
  Update the action bar in settings.

10 years agoMerge "Update the action bar in settings." into klp-dev
Mindy Pereira [Sun, 15 Sep 2013 17:59:11 +0000 (17:59 +0000)]
Merge "Update the action bar in settings." into klp-dev

10 years agoIgnore print service settings activities if they are not exported.
Svetoslav [Sat, 14 Sep 2013 01:40:00 +0000 (18:40 -0700)]
Ignore print service settings activities if they are not exported.

1. The print spooler cannot start not exported activities and they
   should not be started from another application anyway. Therefore,
   we do not start them from settings too even though settings can
   do that since it is signed with the platform certificate.

2. Adding some string changes to meet the translation deadline.

bug:10680224

Change-Id: I69c189e1c502985aceb68d269492f2e86de44ec4

10 years agoam cb46e0bc: (-s ours) am fb9e8646: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 04:44:45 +0000 (21:44 -0700)]
am cb46e0bc: (-s ours) am fb9e8646: (-s ours) Import translations. DO NOT MERGE

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

10 years agoam fb9e8646: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 04:39:31 +0000 (21:39 -0700)]
am fb9e8646: (-s ours) Import translations. DO NOT MERGE

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

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sun, 15 Sep 2013 04:12:30 +0000 (21:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I13c51ef2316f477f02ec447afcd63f036e89ab6f
Auto-generated-cl: translation import

10 years agoam ff8af60a: am 189dab3d: Merge "Activity for messaging installed CA certs, and icon...
Maggie Benthall [Sat, 14 Sep 2013 21:25:02 +0000 (14:25 -0700)]
am ff8af60a: am 189dab3d: Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev

* commit 'ff8af60a9c3098509939b579bf1c0b2cd09d4666':
  Activity for messaging installed CA certs, and icon in Settings.

10 years agoam 189dab3d: Merge "Activity for messaging installed CA certs, and icon in Settings...
Maggie Benthall [Sat, 14 Sep 2013 21:22:26 +0000 (14:22 -0700)]
am 189dab3d: Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev

* commit '189dab3d41312b6404f2121d54580ee2c5b9df8e':
  Activity for messaging installed CA certs, and icon in Settings.

10 years agoMerge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev
Maggie Benthall [Sat, 14 Sep 2013 21:20:05 +0000 (21:20 +0000)]
Merge "Activity for messaging installed CA certs, and icon in Settings." into klp-dev

10 years agoam 7b8507f9: (-s ours) am 119a9ff2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:04:26 +0000 (13:04 -0700)]
am 7b8507f9: (-s ours) am 119a9ff2: (-s ours) Import translations. DO NOT MERGE

* commit '7b8507f912a90aec7778dfeb2dbac9f3c38da378':
  Import translations. DO NOT MERGE

10 years agoam 119a9ff2: (-s ours) Import translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 20:01:35 +0000 (13:01 -0700)]
am 119a9ff2: (-s ours) Import translations. DO NOT MERGE

* commit '119a9ff201551ee5de48aec83b0f472018713bbd':
  Import translations. DO NOT MERGE

10 years agoActivity for messaging installed CA certs, and icon in Settings.
Maggie Benthall [Thu, 5 Sep 2013 19:33:58 +0000 (15:33 -0400)]
Activity for messaging installed CA certs, and icon in Settings.

Add the MonitoringCertInfoActivity, used by Settings, QuickSettings
and notification to explain about CA certs enabling network traffic
monitoring.
Add a button on the Security item in Settings when a cert is installed.

Bug: 10633199

Change-Id: Ic753fe22b66c30d837a9ba471a0632a07bb7471f

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 07:15:31 +0000 (00:15 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ice787280e8cc2b476e3ad7e002f3a9c07fac15fc
Auto-generated-cl: translation import

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 14 Sep 2013 07:11:44 +0000 (00:11 -0700)]
Import translations. DO NOT MERGE

Change-Id: I09a3ac5d24a12b066fb961e686753b1e3677b73d
Auto-generated-cl: translation import

10 years agoUpdate the action bar in settings.
Mindy Pereira [Sat, 14 Sep 2013 03:23:28 +0000 (20:23 -0700)]
Update the action bar in settings.

Change-Id: I7236636c3b5440c9811cb452a082e6e3dd72bb58

10 years agoam 33b18383: am b8e39041: Merge "Allow space management for device admins" into klp-dev
Amith Yamasani [Sat, 14 Sep 2013 00:22:34 +0000 (17:22 -0700)]
am 33b18383: am b8e39041: Merge "Allow space management for device admins" into klp-dev

* commit '33b18383d7942ce6170d662750ed121a02424c4e':
  Allow space management for device admins

10 years agoam c6c6eb1f: am 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev
Zhihai Xu [Sat, 14 Sep 2013 00:22:33 +0000 (17:22 -0700)]
am c6c6eb1f: am 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev

* commit 'c6c6eb1ff84d64b90299787bd4af935b7dac8b64':
  MAP 1.1 Review fixes

10 years agoam aa6bb5eb: am e238a47f: Introduce \'Home\' settings
Christopher Tate [Sat, 14 Sep 2013 00:22:32 +0000 (17:22 -0700)]
am aa6bb5eb: am e238a47f: Introduce \'Home\' settings

* commit 'aa6bb5eb135a461d4215e7ee3d659acaac1b68bb':
  Introduce 'Home' settings

10 years agoam b8e39041: Merge "Allow space management for device admins" into klp-dev
Amith Yamasani [Sat, 14 Sep 2013 00:16:09 +0000 (17:16 -0700)]
am b8e39041: Merge "Allow space management for device admins" into klp-dev

* commit 'b8e39041a5e8994376e44f7b5c5b9cd32a09377e':
  Allow space management for device admins

10 years agoam 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev
Zhihai Xu [Sat, 14 Sep 2013 00:15:13 +0000 (17:15 -0700)]
am 856df43c: Merge "MAP 1.1 Review fixes" into klp-dev

* commit '856df43c064bea26e467e2305791ce022fe4cf6e':
  MAP 1.1 Review fixes

10 years agoam e238a47f: Introduce \'Home\' settings
Christopher Tate [Sat, 14 Sep 2013 00:14:43 +0000 (17:14 -0700)]
am e238a47f: Introduce \'Home\' settings

* commit 'e238a47f5ea6de128cf76eca8ad2b852cb12f4a0':
  Introduce 'Home' settings

10 years agoMerge "Allow space management for device admins" into klp-dev
Amith Yamasani [Fri, 13 Sep 2013 23:52:01 +0000 (23:52 +0000)]
Merge "Allow space management for device admins" into klp-dev

10 years agoam 55ea2736: am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."
Elliott Hughes [Fri, 13 Sep 2013 23:16:26 +0000 (16:16 -0700)]
am 55ea2736: am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."

* commit '55ea2736f7d2fcaaa64d8db8e8186817def714dd':
  Get time zone names from CLDR.

10 years agoam 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."
Elliott Hughes [Fri, 13 Sep 2013 23:14:06 +0000 (16:14 -0700)]
am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."

* commit '3d83f5ca9cb39a8f000da4c7f163a25108e1f478':
  Get time zone names from CLDR.

10 years agoam caeb7a6e: Merge "Get time zone names from CLDR."
Elliott Hughes [Fri, 13 Sep 2013 23:11:43 +0000 (16:11 -0700)]
am caeb7a6e: Merge "Get time zone names from CLDR."

* commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c':
  Get time zone names from CLDR.

10 years agoMerge "Get time zone names from CLDR."
Elliott Hughes [Fri, 13 Sep 2013 23:08:12 +0000 (23:08 +0000)]
Merge "Get time zone names from CLDR."

10 years agoMerge "MAP 1.1 Review fixes" into klp-dev
Zhihai Xu [Fri, 13 Sep 2013 23:00:36 +0000 (23:00 +0000)]
Merge "MAP 1.1 Review fixes" into klp-dev

10 years agoMAP 1.1 Review fixes
Kim Schulz [Thu, 22 Aug 2013 08:59:09 +0000 (10:59 +0200)]
MAP 1.1 Review fixes

- Fixes to the issues found during review.
- added support for BluetoothProfile ProfileService Classes
- Added new MapProfile.java to comply with new structure
- changed ORDINAL to use BluetoothProfile.MAP directly
- Moved construction of MapProfile to LocalBluetoothProfileManager constructor
- Added support for multiple concurent permission activities and/or multiple notifications (i.e. pbap and map permission request right after each other)
- cleanup
- changed settings to use Notification.Builder
- made the notifications for map/pbab more informative
- added handling of back button + "clear all notifications"

Bug:10692365
Change-Id: I9803c9658a96b1a9c1d4734d2fdd22f1421d2827

10 years agoIntroduce 'Home' settings
Christopher Tate [Tue, 27 Aug 2013 21:21:46 +0000 (14:21 -0700)]
Introduce 'Home' settings

Bug 9958444

Change-Id: I868f5b7aa6ae9273b725cb96e80821a82569e7e0

10 years agoDon't crash on rotation when cropping a profile picture
Amith Yamasani [Fri, 13 Sep 2013 16:30:34 +0000 (09:30 -0700)]
Don't crash on rotation when cropping a profile picture

Bug: 8910780

Keep track of pending activity result and avoid deleting the intermediate file.

Change-Id: I56f63e1348c8b1f5229ad3e135016b8b75d3a335

10 years agoAllow space management for device admins
Amith Yamasani [Fri, 13 Sep 2013 17:05:47 +0000 (10:05 -0700)]
Allow space management for device admins

If an active device admin has a space management UI, enable the button
to manage space.

Bug: 10527304

Change-Id: I1d03eec6d766b49b1c3d9bb30151db4cad7e84e8

10 years agoPayments: use latest settings icon.
Martijn Coenen [Fri, 13 Sep 2013 09:38:00 +0000 (11:38 +0200)]
Payments: use latest settings icon.

Bug: 10262585
Change-Id: I40e52c67be73f4c434ced755dbc6d340ff709e2a

10 years agoam 2e997350: am 8b4cdbeb: Fix recent apps in appops. Prior to this fix all apps would...
David Christie [Fri, 13 Sep 2013 04:57:38 +0000 (21:57 -0700)]
am 2e997350: am 8b4cdbeb: Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing).  Tested this out - apps requesting location longer than the threshold sta

* commit '2e99735046df7dc016a0407d1806b5979cbfc445':
  Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing).  Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS.