OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 12:55:10 +0000 (12:55 +0000)]
am 89be2eea: am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '89be2eeab0738e7db8d945ff1267dc9bf8fdaeb2':
  Making Settings > Storage multiprofile aware

9 years agoam 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:37:51 +0000 (11:37 +0000)]
am 38a510df: am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '38a510df76a596007d9425270d8a927018dc2ae2':
  Making Settings > Storage multiprofile aware

9 years agoam 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into...
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:25:44 +0000 (11:25 +0000)]
am 215af288: am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '215af288957eb64235af7a67af2143d1caf37428':
  Making Settings > Storage multiprofile aware

9 years agoam 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 11:10:45 +0000 (11:10 +0000)]
am 461a48ba: Merge "Making Settings > Storage multiprofile aware" into mnc-dev

* commit '461a48bac97c24706fd3b2f789648f61a42def42':
  Making Settings > Storage multiprofile aware

9 years agoMerge "Making Settings > Storage multiprofile aware" into mnc-dev
Zoltan Szatmary-Ban [Wed, 8 Jul 2015 10:54:05 +0000 (10:54 +0000)]
Merge "Making Settings > Storage multiprofile aware" into mnc-dev

9 years agoam 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
Wei Liu [Wed, 8 Jul 2015 01:40:05 +0000 (01:40 +0000)]
am 27e39542: am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.

* commit '27e395427eef95fea47f06b5cc7bbba0e7853016':
  Move NetworkPolicyEditor from Settings packge to settingslib.

9 years agoam 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not...
Christopher Tate [Wed, 8 Jul 2015 01:39:59 +0000 (01:39 +0000)]
am 6c444a03: am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev

* commit '6c444a03f671eb4439792506f09efe8b6b3fdb59':
  App link handling is not just for "official" verified handlers

9 years agoam 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for...
Amith Yamasani [Wed, 8 Jul 2015 01:36:49 +0000 (01:36 +0000)]
am 0531c255: am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '0531c255e6d00498e06811f032744b40fc453e80':
  Use localized name for guest user

9 years agoam e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.
Wei Liu [Wed, 8 Jul 2015 00:42:50 +0000 (00:42 +0000)]
am e0021c42: Move NetworkPolicyEditor from Settings packge to settingslib.

* commit 'e0021c426c75ea8a737714f0b8bb27988ac3a51f':
  Move NetworkPolicyEditor from Settings packge to settingslib.

9 years agoam d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for ...
Christopher Tate [Wed, 8 Jul 2015 00:24:08 +0000 (00:24 +0000)]
am d0528b69: am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev

* commit 'd0528b69d4ad70fdad8e218e618cd875eef96f4f':
  App link handling is not just for "official" verified handlers

9 years agoMove NetworkPolicyEditor from Settings packge to settingslib.
Wei Liu [Tue, 7 Jul 2015 22:37:11 +0000 (15:37 -0700)]
Move NetworkPolicyEditor from Settings packge to settingslib.

Change-Id: I3a2f69c73d983643e65a0d4266cb98a203d5a813

9 years agoam fe71156d: am 8023385e: Merge "App link handling is not just for "official" verifie...
Christopher Tate [Wed, 8 Jul 2015 00:08:17 +0000 (00:08 +0000)]
am fe71156d: am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev

* commit 'fe71156d076792eebd250dc22c5d2e9485f9cf58':
  App link handling is not just for "official" verified handlers

9 years agoam 8023385e: Merge "App link handling is not just for "official" verified handlers...
Christopher Tate [Tue, 7 Jul 2015 23:49:11 +0000 (23:49 +0000)]
am 8023385e: Merge "App link handling is not just for "official" verified handlers" into mnc-dev

* commit '8023385e56e472a55e9c6f5034e04a10f1088f57':
  App link handling is not just for "official" verified handlers

9 years agoMerge "App link handling is not just for "official" verified handlers" into mnc-dev
Christopher Tate [Tue, 7 Jul 2015 23:35:52 +0000 (23:35 +0000)]
Merge "App link handling is not just for "official" verified handlers" into mnc-dev

9 years agoApp link handling is not just for "official" verified handlers
Christopher Tate [Wed, 1 Jul 2015 23:52:43 +0000 (16:52 -0700)]
App link handling is not just for "official" verified handlers

Allow apps to be enabled as link handlers for their accepted domains
even when they are not the "official" apps for those domains.

Also clean up a bunch of inconsistent/wrong state reporting in the UI.

Bug 22069429

Change-Id: Ic3b2bcc476dfc30085d3df7412b02bdc5d53df6d

9 years agoam 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user"...
Amith Yamasani [Tue, 7 Jul 2015 21:09:42 +0000 (21:09 +0000)]
am 8a62bf97: am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '8a62bf97e614d7c644ce600b6e14a7aab79892f6':
  Use localized name for guest user

9 years agoam 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev
Amith Yamasani [Tue, 7 Jul 2015 20:54:18 +0000 (20:54 +0000)]
am 8e9aca37: am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '8e9aca37c6045aeffe83f13a0664cb950a7f7fef':
  Use localized name for guest user

9 years agoam 7ac21204: Merge "Use localized name for guest user" into mnc-dev
Amith Yamasani [Tue, 7 Jul 2015 20:37:31 +0000 (20:37 +0000)]
am 7ac21204: Merge "Use localized name for guest user" into mnc-dev

* commit '7ac21204e16c797cc4f818ccc51509d425ffaf80':
  Use localized name for guest user

9 years agoMerge "Use localized name for guest user" into mnc-dev
Amith Yamasani [Tue, 7 Jul 2015 20:20:03 +0000 (20:20 +0000)]
Merge "Use localized name for guest user" into mnc-dev

9 years agoMaking Settings > Storage multiprofile aware
Zoltan Szatmary-Ban [Wed, 1 Jul 2015 15:45:34 +0000 (16:45 +0100)]
Making Settings > Storage multiprofile aware

Also fixing the order of preferences there.

Bug: 22223456
Bug: 22117317
Change-Id: I9261fe46bfce518fd1ce3d0faef07cffe6869e34

9 years agoUse localized name for guest user
Amith Yamasani [Tue, 7 Jul 2015 17:13:12 +0000 (10:13 -0700)]
Use localized name for guest user

Rather than use the stored name, which depends on the language
in use when the Guest was created, always try to use the localized
word for Guest.

Bug: 22205776
Change-Id: I1a4912b9561196eee811eae31c8df2b72413648f

9 years agoam 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist...
Jorim Jaggi [Mon, 6 Jul 2015 22:32:41 +0000 (22:32 +0000)]
am 21b05211: am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '21b05211955ed9646324eb5f1c1c6a48a596d355':
  Text changes to assist & voice input

9 years agoam a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input...
Jorim Jaggi [Mon, 6 Jul 2015 21:33:39 +0000 (21:33 +0000)]
am a0357604: am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit 'a03576049fb71b42829304a46740a2696a233e29':
  Text changes to assist & voice input

9 years agoam 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 21:20:03 +0000 (21:20 +0000)]
am 30001127: am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '30001127b22ef39e02155919adaa3906829c9688':
  Text changes to assist & voice input

9 years agoam 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 21:04:31 +0000 (21:04 +0000)]
am 2bd619d5: Merge "Text changes to assist & voice input" into mnc-dev

* commit '2bd619d5ed2cdf5a34c3e3830469edc3b29a6eb0':
  Text changes to assist & voice input

9 years agoMerge "Text changes to assist & voice input" into mnc-dev
Jorim Jaggi [Mon, 6 Jul 2015 20:48:39 +0000 (20:48 +0000)]
Merge "Text changes to assist & voice input" into mnc-dev

9 years agoam 41e81016: am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have...
Jeff Sharkey [Mon, 6 Jul 2015 19:18:52 +0000 (19:18 +0000)]
am 41e81016: am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '41e81016f6a2720bf86268fd9562fa4b9654b619':
  Fix init order so we have something to measure.

9 years agoam 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig...
Jeff Sharkey [Mon, 6 Jul 2015 19:18:51 +0000 (19:18 +0000)]
am 084dd048: am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit '084dd0487cc310e6aed81933a32d7f23b39797cf':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoam fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something...
Jeff Sharkey [Mon, 6 Jul 2015 19:02:19 +0000 (19:02 +0000)]
am fe015ffe: am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit 'fe015ffe40c19d60d11b394790e259c513f15ef8':
  Fix init order so we have something to measure.

9 years agoam fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 19:02:18 +0000 (19:02 +0000)]
am fc963764: am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit 'fc963764ab93bd2e6fce2a214f9cc992dbceda73':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoText changes to assist & voice input
Jorim Jaggi [Mon, 6 Jul 2015 18:48:27 +0000 (11:48 -0700)]
Text changes to assist & voice input

Bug: 22063668
Change-Id: I3454f6409d1f5816469505404c77d6a02e53aa50

9 years agoam 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure....
Jeff Sharkey [Mon, 6 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am 355c13d2: am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '355c13d294a6c572637571d7df6369916e92394d':
  Fix init order so we have something to measure.

9 years agoam bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 18:45:35 +0000 (18:45 +0000)]
am bdb64bf1: am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit 'bdb64bf194c882242af6d2c30cdb421a06cce69a':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoam 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 18:12:56 +0000 (18:12 +0000)]
am 66b5a58a: Merge "Fix init order so we have something to measure." into mnc-dev

* commit '66b5a58a6850cbf3a3fdbb8df913f0fc5ea5bdaa':
  Fix init order so we have something to measure.

9 years agoam 7616b00b: Merge changes from topic \'mig\' into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 18:12:55 +0000 (18:12 +0000)]
am 7616b00b: Merge changes from topic \'mig\' into mnc-dev

* commit '7616b00bb5968382c5f49394fc842049f7ce9185':
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoMerge "Fix init order so we have something to measure." into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 18:00:32 +0000 (18:00 +0000)]
Merge "Fix init order so we have something to measure." into mnc-dev

9 years agoMerge changes from topic 'mig' into mnc-dev
Jeff Sharkey [Mon, 6 Jul 2015 17:57:51 +0000 (17:57 +0000)]
Merge changes from topic 'mig' into mnc-dev

* changes:
  Fix some ordering, colors, and accessibility bugs.
  Handle missing migration source volume.

9 years agoFix init order so we have something to measure.
Jeff Sharkey [Mon, 6 Jul 2015 17:17:42 +0000 (10:17 -0700)]
Fix init order so we have something to measure.

Otherwise we start measuring without shared storage in place, meaning
we always find sizes of 0.

Bug: 22231501
Change-Id: I760064684e76e5ef5cce351aee1d81a971f4d4ea

9 years agoam b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da...
Geoff Mendal [Mon, 6 Jul 2015 15:53:50 +0000 (15:53 +0000)]
am b9819796: (-s ours) am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translati...
Geoff Mendal [Mon, 6 Jul 2015 15:33:03 +0000 (15:33 +0000)]
am 1c2260a1: (-s ours) am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

* commit '1c2260a107cd5ffa708e8addf2501014d86dc37e':
  Import translations. DO NOT MERGE

9 years agoam c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:17:10 +0000 (15:17 +0000)]
am c869c959: (-s ours) am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoam e21573da: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 15:02:23 +0000 (15:02 +0000)]
am e21573da: (-s ours) Import translations. DO NOT MERGE

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

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Mon, 6 Jul 2015 14:49:17 +0000 (07:49 -0700)]
Import translations. DO NOT MERGE

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

9 years agoFix some ordering, colors, and accessibility bugs.
Jeff Sharkey [Mon, 6 Jul 2015 05:09:07 +0000 (22:09 -0700)]
Fix some ordering, colors, and accessibility bugs.

When adding preferences to public/private details screens, always
add in-order when rebuilding.  Hacky fix for broken summary text and
eject image color tints.

Fix crash when device rotated during partitioning.  Set correct
accessibility titles in all wizard steps.

Bug: 2209804421376962
Change-Id: I68aff96cba497a91919cad8865722bc9cef7eaa7

9 years agoHandle missing migration source volume.
Jeff Sharkey [Sun, 5 Jul 2015 21:17:40 +0000 (14:17 -0700)]
Handle missing migration source volume.

Users can try migrating primary storage while the current location
is missing/unmounted.  Fail gracefully instead of runtime restarting.

Bug: 21927076
Change-Id: I54b92487faf9e62d5d309734bf4c436a9259d156

9 years agoam bdfc2b0f: am 5b45c3cb: Fix build
Svetoslav [Thu, 2 Jul 2015 02:01:11 +0000 (02:01 +0000)]
am bdfc2b0f: am 5b45c3cb: Fix build

* commit 'bdfc2b0f9465f9683aa8a06443421166f5c9d398':
  Fix build

9 years agoam 5b45c3cb: Fix build
Svetoslav [Thu, 2 Jul 2015 01:47:59 +0000 (01:47 +0000)]
am 5b45c3cb: Fix build

* commit '5b45c3cb2fdd9299a3fa632047f3da1bec4e868a':
  Fix build

9 years agoFix build
Svetoslav [Thu, 2 Jul 2015 01:33:32 +0000 (18:33 -0700)]
Fix build

Change-Id: I658528a9b0a8a281a2b30b2915c1be6963759378

9 years agoam f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Thu, 2 Jul 2015 01:02:48 +0000 (01:02 +0000)]
am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'f35bd64130ceb668a8fee544ef3b888f51d3eb14':
  Fix USB mode development setting

9 years agoam b8b20a50: Merge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Thu, 2 Jul 2015 00:46:53 +0000 (00:46 +0000)]
am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'b8b20a503255da8097d64a2f1554d118f8e3c424':
  Fix USB mode development setting

9 years agoMerge "Fix USB mode development setting" into mnc-dev
Marco Nelissen [Wed, 1 Jul 2015 19:13:43 +0000 (19:13 +0000)]
Merge "Fix USB mode development setting" into mnc-dev

9 years agoam ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 1 Jul 2015 17:12:43 +0000 (17:12 +0000)]
am ad44e83e: (-s ours) am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam a6eca19a: am f7806581: Avoid crashing
Jason Monk [Wed, 1 Jul 2015 17:12:42 +0000 (17:12 +0000)]
am a6eca19a: am f7806581: Avoid crashing

* commit 'a6eca19ad15eb75588635f89dec1093c9eecffdf':
  Avoid crashing

9 years agoam 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when Bluetooth...
Avish Shah [Wed, 1 Jul 2015 17:12:41 +0000 (17:12 +0000)]
am 76ffaaa2: am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled

* commit '76ffaaa238b20cc103e8a08a22d9db1f5990ccff':
  Device Discoverability not set properly when Bluetooth is toggled

9 years agoam 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 16:21:50 +0000 (16:21 +0000)]
am 85a71d6a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '85a71d6a622eef2cc5258e737c305227cebe2e95':
  Import translations. DO NOT MERGE

9 years agoam f7806581: Avoid crashing
Jason Monk [Wed, 1 Jul 2015 16:21:31 +0000 (16:21 +0000)]
am f7806581: Avoid crashing

* commit 'f7806581e582e5921d0eb4caa9751d1aa429bc47':
  Avoid crashing

9 years agoam ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled
Avish Shah [Wed, 1 Jul 2015 16:19:36 +0000 (16:19 +0000)]
am ad1f28cd: Device Discoverability not set properly when Bluetooth is toggled

* commit 'ad1f28cde0ec117a0d526bae61fb661587914f33':
  Device Discoverability not set properly when Bluetooth is toggled

9 years agoFix USB mode development setting
Marco Nelissen [Tue, 30 Jun 2015 21:52:04 +0000 (14:52 -0700)]
Fix USB mode development setting

USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.

Bug: 22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 1 Jul 2015 15:42:32 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 1 Jul 2015 14:52:03 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE

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

9 years agoAvoid crashing
Jason Monk [Wed, 1 Jul 2015 14:36:30 +0000 (10:36 -0400)]
Avoid crashing

Bug: 22202631
Change-Id: I1980f77ae4300dbd19d6829dc5974bab0b88d612

9 years agoDevice Discoverability not set properly when Bluetooth is toggled
Avish Shah [Fri, 19 Jun 2015 11:20:39 +0000 (16:50 +0530)]
Device Discoverability not set properly when Bluetooth is toggled

Issue:
When BT is turned off/on staying in the same BT Settings
screen discoverability was not set again.

Fix:
Handle setting discoverability Bluetooth state change
intents also when BT state is  turned ON.

Bug: 21944289
Change-Id: Ic3c8d476c53673b21d40ea2bd9669758d89c2aee

9 years agoam 09948d48: am 56594c6d: Update FakeUid to implement new method defined in BatterySt...
Adam Lesinski [Wed, 1 Jul 2015 01:06:54 +0000 (01:06 +0000)]
am 09948d48: am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid

* commit '09948d4804f34d76f8e0987efec7b313eb03e3ee':
  Update FakeUid to implement new method defined in BatteryStats.Uid

9 years agoam 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Wed, 1 Jul 2015 00:53:08 +0000 (00:53 +0000)]
am 56594c6d: Update FakeUid to implement new method defined in BatteryStats.Uid

* commit '56594c6d61c63d6cab28b32f431f6f0d9c84af91':
  Update FakeUid to implement new method defined in BatteryStats.Uid

9 years agoUpdate FakeUid to implement new method defined in BatteryStats.Uid
Adam Lesinski [Sat, 27 Jun 2015 01:05:37 +0000 (18:05 -0700)]
Update FakeUid to implement new method defined in BatteryStats.Uid

Bug:21498425
Change-Id: I956c04d13daf985d472cc7ff2762ad74d5bb9502

9 years agoam 985d1029: am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:40:59 +0000 (23:40 +0000)]
am 985d1029: am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev

* commit '985d10296a87fe3ffeeec18d51f9af8fc96588ed':
  Merge dex2oat with app being installed

9 years agoam fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:30:15 +0000 (23:30 +0000)]
am fba915be: Merge "Merge dex2oat with app being installed" into mnc-dev

* commit 'fba915be162f5e32e1a614c5497ef08b216a5b3a':
  Merge dex2oat with app being installed

9 years agoam 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal...
Amith Yamasani [Tue, 30 Jun 2015 23:26:32 +0000 (23:26 +0000)]
am 5bfbc07f: am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

* commit '5bfbc07fc761009e2b4116d47d6bda7460061840':
  Only allow admin users to adopt sd card as internal storage.

9 years agoMerge "Merge dex2oat with app being installed" into mnc-dev
Adam Lesinski [Tue, 30 Jun 2015 23:16:18 +0000 (23:16 +0000)]
Merge "Merge dex2oat with app being installed" into mnc-dev

9 years agoam a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage....
Amith Yamasani [Tue, 30 Jun 2015 23:13:51 +0000 (23:13 +0000)]
am a8c4db48: Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

* commit 'a8c4db48c26634836ade77f3f8f0403089245f9c':
  Only allow admin users to adopt sd card as internal storage.

9 years agoMerge "Only allow admin users to adopt sd card as internal storage." into mnc-dev
Amith Yamasani [Tue, 30 Jun 2015 23:00:27 +0000 (23:00 +0000)]
Merge "Only allow admin users to adopt sd card as internal storage." into mnc-dev

9 years agoOnly allow admin users to adopt sd card as internal storage.
Amith Yamasani [Tue, 30 Jun 2015 21:23:54 +0000 (14:23 -0700)]
Only allow admin users to adopt sd card as internal storage.

Bug: 21883016
Change-Id: I11ca324ab74ce2a8bf13064b4c7735aea132c562

9 years agoam f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 21:22:35 +0000 (21:22 +0000)]
am f1d70b5f: am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev

* commit 'f1d70b5f7da3929afbc27494539c8e1bbafd77c4':
  Handle adjust volume user restriction

9 years agoam a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:21:50 +0000 (20:21 +0000)]
am a8af51b2: Merge "Handle adjust volume user restriction" into mnc-dev

* commit 'a8af51b2d8706455c8c541a4773c883341a5b73c':
  Handle adjust volume user restriction

9 years agoMerge "Handle adjust volume user restriction" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 20:08:13 +0000 (20:08 +0000)]
Merge "Handle adjust volume user restriction" into mnc-dev

9 years agoHandle adjust volume user restriction
Jason Monk [Tue, 30 Jun 2015 16:18:26 +0000 (12:18 -0400)]
Handle adjust volume user restriction

 - Finish all do not disturb pages immediately
 - Disable relevant items in Sounds & notification

Bug: 21642285
Change-Id: I8de9bd10b8cea8adaa306b1ae388ab7d1ccc4e7e

9 years agoam 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instan...
Makoto Onuki [Tue, 30 Jun 2015 17:28:37 +0000 (17:28 +0000)]
am 3ff8ce1d: am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

* commit '3ff8ce1d9de9efcf88981f6c9b4b63497be8ae7f':
  Make sure Fragments are public for FragMan to instantiate

9 years agoam a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into...
Makoto Onuki [Tue, 30 Jun 2015 16:54:11 +0000 (16:54 +0000)]
am a2bd2eac: Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

* commit 'a2bd2eacc3f2688feffafa6ca7050141ad4675eb':
  Make sure Fragments are public for FragMan to instantiate

9 years agoMerge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev
Makoto Onuki [Tue, 30 Jun 2015 16:40:56 +0000 (16:40 +0000)]
Merge "Make sure Fragments are public for FragMan to instantiate" into mnc-dev

9 years agoam e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:45:41 +0000 (14:45 +0000)]
am e6cbdf19: am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev

* commit 'e6cbdf19b556436ed6571f2f828ed7c1374f90ce':
  Fix crash in ignore optimizations dialog

9 years agoam e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:32:58 +0000 (14:32 +0000)]
am e6a0bee5: Merge "Fix crash in ignore optimizations dialog" into mnc-dev

* commit 'e6a0bee557c8f2ceaa25cd8287511b55479e7293':
  Fix crash in ignore optimizations dialog

9 years agoam 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format...
Rubin Xu [Tue, 30 Jun 2015 14:21:06 +0000 (14:21 +0000)]
am 4421438c: am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

* commit '4421438c50d076ee91b8fc333fa23c7d4dc424ed':
  No longer use ExternalStorageFormatter to format external storage

9 years agoam a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:21:05 +0000 (14:21 +0000)]
am a992bb3d: am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev

* commit 'a992bb3dfb94705053ca91ac9d31e8a530d2b984':
  Reduce jank in wifi settings

9 years agoMerge "Fix crash in ignore optimizations dialog" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:20:57 +0000 (14:20 +0000)]
Merge "Fix crash in ignore optimizations dialog" into mnc-dev

9 years agoFix crash in ignore optimizations dialog
Jason Monk [Tue, 30 Jun 2015 14:15:53 +0000 (10:15 -0400)]
Fix crash in ignore optimizations dialog

Launch it like a dialog, because it is one.

Bug: 22181580
Change-Id: Ibeda8506cfb7a9a9d60f70462a4e03972b38f8aa

9 years agoam 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage...
Rubin Xu [Tue, 30 Jun 2015 14:12:39 +0000 (14:12 +0000)]
am 02c7e95f: Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

* commit '02c7e95fd4e03d7356def00f68e6e93f4da87f73':
  No longer use ExternalStorageFormatter to format external storage

9 years agoam 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:12:38 +0000 (14:12 +0000)]
am 6799ef42: Merge "Reduce jank in wifi settings" into mnc-dev

* commit '6799ef423b18c37c9a8a3684159dd185f61a0931':
  Reduce jank in wifi settings

9 years agoMerge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev
Rubin Xu [Tue, 30 Jun 2015 14:05:31 +0000 (14:05 +0000)]
Merge "No longer use ExternalStorageFormatter to format external storage" into mnc-dev

9 years agoMerge "Reduce jank in wifi settings" into mnc-dev
Jason Monk [Tue, 30 Jun 2015 14:03:04 +0000 (14:03 +0000)]
Merge "Reduce jank in wifi settings" into mnc-dev

9 years agoam ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)
Jorim Jaggi [Tue, 30 Jun 2015 00:49:24 +0000 (00:49 +0000)]
am ea53bfcd: am d9bd96b3: Add setting to disable screenshot separately (2/2)

* commit 'ea53bfcddf8c8b37a154bcbdcbbec2ee71b109d9':
  Add setting to disable screenshot separately (2/2)

9 years agoam d9bd96b3: Add setting to disable screenshot separately (2/2)
Jorim Jaggi [Tue, 30 Jun 2015 00:35:45 +0000 (00:35 +0000)]
am d9bd96b3: Add setting to disable screenshot separately (2/2)

* commit 'd9bd96b3094039fdcb8c76042a6f2dc21d6c7875':
  Add setting to disable screenshot separately (2/2)

9 years agoMerge dex2oat with app being installed
Adam Lesinski [Fri, 26 Jun 2015 23:31:44 +0000 (16:31 -0700)]
Merge dex2oat with app being installed

Bug:22008744
Change-Id: Id87fe215760202e2969c27d686fa8ba106b00754

9 years agoAdd setting to disable screenshot separately (2/2)
Jorim Jaggi [Fri, 26 Jun 2015 23:40:41 +0000 (16:40 -0700)]
Add setting to disable screenshot separately (2/2)

Bug: 22063668
Change-Id: I85b255ac114184e0edbd71010d517b337ad935e5

9 years agoam ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles
Jorim Jaggi [Mon, 29 Jun 2015 21:23:26 +0000 (21:23 +0000)]
am ea673970: am 1e7b8f86: Fix userId for credentials from managed profiles

* commit 'ea673970e16b49f28d7f39c8b4993f186e561d6d':
  Fix userId for credentials from managed profiles

9 years agoam 1e7b8f86: Fix userId for credentials from managed profiles
Jorim Jaggi [Mon, 29 Jun 2015 21:04:41 +0000 (21:04 +0000)]
am 1e7b8f86: Fix userId for credentials from managed profiles

* commit '1e7b8f86d8aa46d2ed24b75adb453833ef2d1a88':
  Fix userId for credentials from managed profiles

9 years agoFix userId for credentials from managed profiles
Jorim Jaggi [Sat, 27 Jun 2015 01:49:35 +0000 (18:49 -0700)]
Fix userId for credentials from managed profiles

Bug: 22094377
Change-Id: Ia98d0e386d4c56f3eb502ff11f86b0fd7dadea3c

9 years agoam 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 20:16:18 +0000 (20:16 +0000)]
am 2d6445d4: am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev

* commit '2d6445d4a1b99f95dd5f11561fc9392c7c9eb407':
  Remove char limit from owner info

9 years agoam 312c90c8: Merge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 20:04:49 +0000 (20:04 +0000)]
am 312c90c8: Merge "Remove char limit from owner info" into mnc-dev

* commit '312c90c8caa4fdc59e9a4bd9f900d23ec7274495':
  Remove char limit from owner info

9 years agoMerge "Remove char limit from owner info" into mnc-dev
Jason Monk [Mon, 29 Jun 2015 19:52:51 +0000 (19:52 +0000)]
Merge "Remove char limit from owner info" into mnc-dev

9 years agoRemove char limit from owner info
Jason Monk [Mon, 29 Jun 2015 18:52:54 +0000 (14:52 -0400)]
Remove char limit from owner info

Bug: 21959734
Change-Id: I21854309ca390cb126ba50feaa56fb9a35b862e1