OSDN Git Service

android-x86/packages-apps-Settings.git
9 years agoam 72723306: am d10261eb: am 3803d91a: New strings!
Jeff Sharkey [Thu, 11 Jun 2015 05:56:16 +0000 (05:56 +0000)]
am 72723306: am d10261eb: am 3803d91a: New strings!

* commit '72723306a18b4148240e98bff8cb0f78004d76e7':
  New strings!

9 years agoam 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use depreca...
Lajos Molnar [Thu, 11 Jun 2015 05:56:14 +0000 (05:56 +0000)]
am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev

* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings

9 years agoam 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external...
Jorim Jaggi [Thu, 11 Jun 2015 05:56:12 +0000 (05:56 +0000)]
am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev

* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)

9 years agoam 234c4c6c: am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back...
Lucky Zhang [Thu, 11 Jun 2015 05:56:10 +0000 (05:56 +0000)]
am 234c4c6c: am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev

* commit '234c4c6c7c7e4a5b82c3f88d4343da10912eab98':
  [Settings] Pass lock type extra back to SUW

9 years agoam d10261eb: am 3803d91a: New strings!
Jeff Sharkey [Thu, 11 Jun 2015 02:53:16 +0000 (02:53 +0000)]
am d10261eb: am 3803d91a: New strings!

* commit 'd10261eb7bafbce83cb9b106b515799edd2b7e8a':
  New strings!

9 years agoam f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePl...
Lajos Molnar [Thu, 11 Jun 2015 02:53:15 +0000 (02:53 +0000)]
am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev

* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
  developer settings: remove "Use deprecated AwesomePlayer" settings

9 years agoam a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device...
Jorim Jaggi [Thu, 11 Jun 2015 02:53:13 +0000 (02:53 +0000)]
am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev

* commit 'a66b907b1610ad67fd8c9b5746fa579bf886825c':
  Animations/success state for external confirm device credentials (2/2)

9 years agoam ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into...
Lucky Zhang [Thu, 11 Jun 2015 02:53:12 +0000 (02:53 +0000)]
am ab21c7fa: am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev

* commit 'ab21c7fa458e8aeabeef22096e304fd0c9a484da':
  [Settings] Pass lock type extra back to SUW

9 years agoam 54d37cdd: am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is...
Nick Kralevich [Thu, 11 Jun 2015 01:34:11 +0000 (01:34 +0000)]
am 54d37cdd: am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev

* commit '54d37cddc6a8986e5966fc6058e0f1dcd6d808cd':
  Fix USB access control when adb is disabled.

9 years agoam 3b145d90: am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don...
Jason Monk [Thu, 11 Jun 2015 01:34:10 +0000 (01:34 +0000)]
am 3b145d90: am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev

* commit '3b145d9086fb46a0d20c2724dac6ae8ef1e24400':
  Hide tap to wake on devices that don't support it

9 years agoam 24da8529: am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size...
Jason Monk [Thu, 11 Jun 2015 01:34:09 +0000 (01:34 +0000)]
am 24da8529: am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev

* commit '24da85296897a4130961491978e7b339e5f77a37':
  App storage settings - Request size onResume

9 years agoam 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizat...
Jason Monk [Thu, 11 Jun 2015 01:34:07 +0000 (01:34 +0000)]
am 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev

* commit '68ce17ff25b497edb7e0ec20a672475b76e604c8':
  New dialog for ignore battery optimizations

9 years agoam efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access...
Jason Monk [Thu, 11 Jun 2015 01:34:06 +0000 (01:34 +0000)]
am efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning

* commit 'efb955f3f5689062da6e326c6277e1a3758d5436':
  Add string for profile owner usage access warning

9 years agoam c568dab6: am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into...
Jeff Brown [Thu, 11 Jun 2015 01:34:05 +0000 (01:34 +0000)]
am c568dab6: am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev

* commit 'c568dab675e3024c64f9be47f7831181b8889d20':
  Add simulated 4K display modes.

9 years agoam 3803d91a: New strings!
Jeff Sharkey [Thu, 11 Jun 2015 01:33:32 +0000 (01:33 +0000)]
am 3803d91a: New strings!

* commit '3803d91abb1e6eb034656b202bbb4aa29afa98ba':
  New strings!

9 years agoam 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" setting...
Lajos Molnar [Thu, 11 Jun 2015 01:32:51 +0000 (01:32 +0000)]
am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev

* commit '63504d832672c0738604410d3c309a563114b81e':
  developer settings: remove "Use deprecated AwesomePlayer" settings

9 years agoam ed76e59e: Merge "Animations/success state for external confirm device credentials...
Jorim Jaggi [Thu, 11 Jun 2015 01:32:31 +0000 (01:32 +0000)]
am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev

* commit 'ed76e59e49657e6a49d140bfea8ddd764e5ba731':
  Animations/success state for external confirm device credentials (2/2)

9 years agoam 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev
Lucky Zhang [Thu, 11 Jun 2015 01:32:09 +0000 (01:32 +0000)]
am 34450932: Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev

* commit '34450932b28565edfe3009dfdb2f92476c11671a':
  [Settings] Pass lock type extra back to SUW

9 years agoNew strings!
Jeff Sharkey [Wed, 10 Jun 2015 21:21:19 +0000 (14:21 -0700)]
New strings!

Bug: 2173757321666225217566982173766621471429
Change-Id: If74f6cc15dfaa16bd78afebc5fc8a977b61cb6b0

9 years agoMerge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev
Lajos Molnar [Wed, 10 Jun 2015 23:23:49 +0000 (23:23 +0000)]
Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev

9 years agoam d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into...
Nick Kralevich [Wed, 10 Jun 2015 23:16:38 +0000 (23:16 +0000)]
am d9bd6a65: am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev

* commit 'd9bd6a65769633548ffd3f281743c112a946a84d':
  Fix USB access control when adb is disabled.

9 years agoam c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support...
Jason Monk [Wed, 10 Jun 2015 23:15:36 +0000 (23:15 +0000)]
am c5884544: am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev

* commit 'c58845442a94bd7d4945cb1d28aec673b29c338b':
  Hide tap to wake on devices that don't support it

9 years agoam ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into...
Jason Monk [Wed, 10 Jun 2015 23:15:30 +0000 (23:15 +0000)]
am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev

* commit 'ac6bb3c23b6d2e0b4bd6003a3c6fbda8f6ba0a0c':
  App storage settings - Request size onResume

9 years agoam 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into...
Jason Monk [Wed, 10 Jun 2015 23:15:28 +0000 (23:15 +0000)]
am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev

* commit '3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
  New dialog for ignore battery optimizations

9 years agoam ef77eb2e: am f8d131e1: Add string for profile owner usage access warning
Jason Monk [Wed, 10 Jun 2015 23:15:05 +0000 (23:15 +0000)]
am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning

* commit 'ef77eb2ecc96936854d5b3473591dfaca16e0ae7':
  Add string for profile owner usage access warning

9 years agoam f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 23:14:44 +0000 (23:14 +0000)]
am f7b9a021: am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev

* commit 'f7b9a0217cc0cfb0bb35811465a560fad8cf8786':
  Add simulated 4K display modes.

9 years agoMerge "Animations/success state for external confirm device credentials (2/2)" into...
Jorim Jaggi [Wed, 10 Jun 2015 23:10:06 +0000 (23:10 +0000)]
Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev

9 years agoMerge "[Settings] Pass lock type extra back to SUW" into mnc-dev
Lucky Zhang [Wed, 10 Jun 2015 23:01:25 +0000 (23:01 +0000)]
Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev

9 years agoAnimations/success state for external confirm device credentials (2/2)
Jorim Jaggi [Tue, 9 Jun 2015 22:31:28 +0000 (15:31 -0700)]
Animations/success state for external confirm device credentials (2/2)

Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5

9 years agodeveloper settings: remove "Use deprecated AwesomePlayer" settings
Lajos Molnar [Wed, 10 Jun 2015 21:57:48 +0000 (14:57 -0700)]
developer settings: remove "Use deprecated AwesomePlayer" settings

Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c

9 years agoAdd ellipsis to "Starting Android".
Paul Crowley [Wed, 10 Jun 2015 21:25:46 +0000 (22:25 +0100)]
Add ellipsis to "Starting Android".

Bug: 20518822
Change-Id: I04f8380ca585680901a65b0741456f5ff44b3c0a

9 years agoam 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev
Nick Kralevich [Wed, 10 Jun 2015 21:25:35 +0000 (21:25 +0000)]
am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev

* commit '8da8e528748fccf4b2291536592648a8e99a36d6':
  Fix USB access control when adb is disabled.

9 years agoMerge "Fix USB access control when adb is disabled." into mnc-dev
Nick Kralevich [Wed, 10 Jun 2015 21:11:31 +0000 (21:11 +0000)]
Merge "Fix USB access control when adb is disabled." into mnc-dev

9 years agoam a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:38:52 +0000 (20:38 +0000)]
am a576d55a: Merge "Hide tap to wake on devices that don\'t support it" into mnc-dev

* commit 'a576d55a0e941e1f06c5edffcbcbaa8d01fc2b64':
  Hide tap to wake on devices that don't support it

9 years agoMerge "Hide tap to wake on devices that don't support it" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:26:12 +0000 (20:26 +0000)]
Merge "Hide tap to wake on devices that don't support it" into mnc-dev

9 years agoHide tap to wake on devices that don't support it
Jason Monk [Mon, 8 Jun 2015 13:11:48 +0000 (09:11 -0400)]
Hide tap to wake on devices that don't support it

Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed

9 years agoam dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:14:35 +0000 (20:14 +0000)]
am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev

* commit 'dc748cb38ac79fb445d7bbba6f8220a85820d03a':
  App storage settings - Request size onResume

9 years agoam d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:14:34 +0000 (20:14 +0000)]
am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev

* commit 'd09be7ed30d2ed4f3298c3075f506612b91a5878':
  New dialog for ignore battery optimizations

9 years agoMerge "App storage settings - Request size onResume" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:12:06 +0000 (20:12 +0000)]
Merge "App storage settings - Request size onResume" into mnc-dev

9 years agoApp storage settings - Request size onResume
Jason Monk [Wed, 10 Jun 2015 20:08:01 +0000 (16:08 -0400)]
App storage settings - Request size onResume

Our data might be stale (especially when coming from manage space
activities).

Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb

9 years agoMerge "New dialog for ignore battery optimizations" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 20:06:09 +0000 (20:06 +0000)]
Merge "New dialog for ignore battery optimizations" into mnc-dev

9 years agoam f8d131e1: Add string for profile owner usage access warning
Jason Monk [Wed, 10 Jun 2015 19:55:01 +0000 (19:55 +0000)]
am f8d131e1: Add string for profile owner usage access warning

* commit 'f8d131e181a273ed8664222e754b10a5824d56ac':
  Add string for profile owner usage access warning

9 years agoNew dialog for ignore battery optimizations
Jason Monk [Wed, 10 Jun 2015 15:03:06 +0000 (11:03 -0400)]
New dialog for ignore battery optimizations

Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f

9 years ago[Settings] Pass lock type extra back to SUW
Lucky Zhang [Wed, 10 Jun 2015 18:05:09 +0000 (11:05 -0700)]
[Settings] Pass lock type extra back to SUW

When SetupChooseLockGeneric finishes, it will include the lock type
(password quality) as an extra in the returned intent data. This extra
will be used by Setup Wizard to determine the lock type and log it for
the metrics.

Bug: 20349248
Change-Id: I501e07254ab857ad4f137e7050326415853883d1

9 years agoam f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 19:33:02 +0000 (19:33 +0000)]
am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev

* commit 'f8f9088a6def1186038c35ec3319113262825f20':
  Add simulated 4K display modes.

9 years agoAdd string for profile owner usage access warning
Jason Monk [Wed, 10 Jun 2015 19:26:35 +0000 (15:26 -0400)]
Add string for profile owner usage access warning

Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68

9 years agoMerge "Add simulated 4K display modes." into mnc-dev
Jeff Brown [Wed, 10 Jun 2015 19:21:09 +0000 (19:21 +0000)]
Merge "Add simulated 4K display modes." into mnc-dev

9 years agoam 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting...
Xiyuan Xia [Wed, 10 Jun 2015 17:47:59 +0000 (17:47 +0000)]
am 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev

* commit '67b438b1185f6d11712ee9c962066c1651479507':
  Implement default assist app setting

9 years agoam a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev
Xiyuan Xia [Wed, 10 Jun 2015 17:32:43 +0000 (17:32 +0000)]
am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev

* commit 'a218ebb090e3ac06d5c324bafb89e2d4d3ef7741':
  Implement default assist app setting

9 years agoFix USB access control when adb is disabled.
Nick Kralevich [Wed, 10 Jun 2015 16:39:26 +0000 (09:39 -0700)]
Fix USB access control when adb is disabled.

When adb is disabled, the default usb mode would be "none", which
would turn off the driver and prevent UsbDeviceManager from receiving
any new USB connect / disconnect messages. This prevents the user
from ever enabling MTP and sharing data when adb is turned off.

As discussed in bug 21429947, we work around this problem by keeping
the USB driver in MTP mode most of the time, so that we continue to
receive USB connect / disconnect messages.

To avoid leaking confidential user photos, we now explicitly unlock
USB data after switching into MTP/PTP mode. Enabling MTP mode is
now decoupled from exposing data on the USB connection.

Bug: 21429947
Change-Id: Id8e9df4ac42fdcf22cc5b75b838bf46f6c225081

9 years agoam 9823f279: Merge "Implement default assist app setting" into mnc-dev
Xiyuan Xia [Wed, 10 Jun 2015 17:21:01 +0000 (17:21 +0000)]
am 9823f279: Merge "Implement default assist app setting" into mnc-dev

* commit '9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
  Implement default assist app setting

9 years agoam 2f951024: am c81dad78: am 0bd18745: Merge "Show list of permissions instead of...
Makoto Onuki [Wed, 10 Jun 2015 17:21:00 +0000 (17:21 +0000)]
am 2f951024: am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev

* commit '2f951024e40b9bc2662aa5ef53a4544f769999e9':
  Show list of permissions instead of just numbers

9 years agoam 24f48299: am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notific...
Lorenzo Colitti [Wed, 10 Jun 2015 17:13:29 +0000 (17:13 +0000)]
am 24f48299: am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev

* commit '24f4829994e047b1674fdf66c1dad51bcaf900d7':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.

9 years agoam 48452195: (-s ours) am f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import...
Geoff Mendal [Wed, 10 Jun 2015 17:13:28 +0000 (17:13 +0000)]
am 48452195: (-s ours) am f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '4845219514add4c4b4cd26b9e503fd3fb2f5ed34':
  Import translations. DO NOT MERGE

9 years agoam 8ff3e055: am fba2680e: am f9402321: Fix legal info back button
Jason Monk [Wed, 10 Jun 2015 17:13:27 +0000 (17:13 +0000)]
am 8ff3e055: am fba2680e: am f9402321: Fix legal info back button

* commit '8ff3e055b09c03295b87654d7bf3430e792772ce':
  Fix legal info back button

9 years agoam 5b11ad26: am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 17:13:02 +0000 (17:13 +0000)]
am 5b11ad26: am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev

* commit '5b11ad2666227146db5983e7ea0073bc0cc12bd4':
  annoint new constants

9 years agoam 68da427f: am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 17:13:01 +0000 (17:13 +0000)]
am 68da427f: am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries

* commit '68da427f481f24c8c0f571f7915620f7c83c6912':
  Remove periods from ignore optimizations summaries

9 years agoam 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 17:13:00 +0000 (17:13 +0000)]
am 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev

* commit '6dc33a5ac7a2352be62b75edf1afc399821b38af':
  Advanced apps updates (2/2)

9 years agoam 83fde1b0: am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into...
Jason Monk [Wed, 10 Jun 2015 17:12:58 +0000 (17:12 +0000)]
am 83fde1b0: am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev

* commit '83fde1b0336a62193282dc27767c07fb6a71a8fb':
  Add sd card string, just in case

9 years agoam db8d0a9a: am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLi...
Neil Fuller [Wed, 10 Jun 2015 17:12:57 +0000 (17:12 +0000)]
am db8d0a9a: am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev

* commit 'db8d0a9a370a55010d1d2d4e1efb06b7a02bedb3':
  Modifications for changes to SettingsLib

9 years agoMerge "Implement default assist app setting" into mnc-dev
Xiyuan Xia [Wed, 10 Jun 2015 17:08:43 +0000 (17:08 +0000)]
Merge "Implement default assist app setting" into mnc-dev

9 years agoam c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers...
Makoto Onuki [Wed, 10 Jun 2015 17:00:06 +0000 (17:00 +0000)]
am c81dad78: am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev

* commit 'c81dad78ea6ecf5819f07790126ba7424b7a7499':
  Show list of permissions instead of just numbers

9 years agoam 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 16:51:24 +0000 (16:51 +0000)]
am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev

* commit '0bd18745cff354f6994b70e71f3ab6b7e98fe004':
  Show list of permissions instead of just numbers

9 years agoMerge "Show list of permissions instead of just numbers" into mnc-dev
Makoto Onuki [Wed, 10 Jun 2015 16:39:06 +0000 (16:39 +0000)]
Merge "Show list of permissions instead of just numbers" into mnc-dev

9 years agoam a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into...
Lorenzo Colitti [Wed, 10 Jun 2015 15:56:36 +0000 (15:56 +0000)]
am a41c3580: am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev

* commit 'a41c3580a96edce8e0dfbec6a7a4ad8ef2c9bf0c':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.

9 years agoam f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import translations. DO NOT...
Geoff Mendal [Wed, 10 Jun 2015 15:56:35 +0000 (15:56 +0000)]
am f0e5a755: (-s ours) am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam fba2680e: am f9402321: Fix legal info back button
Jason Monk [Wed, 10 Jun 2015 15:56:34 +0000 (15:56 +0000)]
am fba2680e: am f9402321: Fix legal info back button

* commit 'fba2680ebb63f0195b3267b7dec8d9cc413896fd':
  Fix legal info back button

9 years agoImplement default assist app setting
Xiyuan Xia [Tue, 2 Jun 2015 21:55:32 +0000 (14:55 -0700)]
Implement default assist app setting

- Add "None" support to AppListPreference
- Add DefaultAssistPreference to manage assist;
- Add AppListPreferenceWithSettings to show a settings icon;
- Implement DefaultAssistPreference based on AppListPreferenceWithSettings;
- Move voice input settings into ManageAssist and implement it
  based on AppListPreferenceWithSettings;

Bug:20210110
Change-Id: If283b8b55a46b428ecfa6e45dc2123292b1d4302

9 years agoam 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev
Lorenzo Colitti [Wed, 10 Jun 2015 15:42:35 +0000 (15:42 +0000)]
am 275e6f75: Merge changes from topic \'no-internet-notification\' into mnc-dev

* commit '275e6f75208c08eb925048a330ed4aab96e51033':
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.

9 years agoam 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 10 Jun 2015 15:42:34 +0000 (15:42 +0000)]
am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '3e0514d7464c8da8fb4ce7fb132410cb53573bef':
  Import translations. DO NOT MERGE

9 years agoam f9402321: Fix legal info back button
Jason Monk [Wed, 10 Jun 2015 15:42:16 +0000 (15:42 +0000)]
am f9402321: Fix legal info back button

* commit 'f94023216accd128b06acdc50950e455a60a9c4e':
  Fix legal info back button

9 years agoMerge changes from topic 'no-internet-notification' into mnc-dev
Lorenzo Colitti [Wed, 10 Jun 2015 15:25:24 +0000 (15:25 +0000)]
Merge changes from topic 'no-internet-notification' into mnc-dev

* changes:
  Pass in the netId using intent data, not intent extras.
  Reword "no internet access" dialog to conform with mocks.

9 years agoMerge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 10 Jun 2015 15:25:01 +0000 (15:25 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev

9 years agoam fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 15:11:55 +0000 (15:11 +0000)]
am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev

* commit 'fa8889a88c162595b8cac8d2749dff401a5ea39c':
  annoint new constants

9 years agoam 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 15:11:54 +0000 (15:11 +0000)]
am 5365a8fd: am caec03f9: Remove periods from ignore optimizations summaries

* commit '5365a8fd3a2aee18a0d6faecd43ad2994a09951c':
  Remove periods from ignore optimizations summaries

9 years agoam 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 15:11:53 +0000 (15:11 +0000)]
am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev

* commit '5b23db3ce61e5d2e43bb0f0757cf823c2d8f3d4d':
  Advanced apps updates (2/2)

9 years agoam 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 15:11:52 +0000 (15:11 +0000)]
am 6c6a212f: am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev

* commit '6c6a212f0351a5711224f684c73123ff81d1504d':
  Add sd card string, just in case

9 years agoam 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 15:11:47 +0000 (15:11 +0000)]
am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev

* commit '54786a6adf695dcc1378bdbfc261590c91d0199a':
  Modifications for changes to SettingsLib

9 years agoFix legal info back button
Jason Monk [Wed, 10 Jun 2015 14:02:59 +0000 (10:02 -0400)]
Fix legal info back button

Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Jun 2015 15:04:57 +0000 (08:04 -0700)]
Import translations. DO NOT MERGE

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

9 years agoam da6a4904: Merge "annoint new constants" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 14:54:38 +0000 (14:54 +0000)]
am da6a4904: Merge "annoint new constants" into mnc-dev

* commit 'da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
  annoint new constants

9 years agoam caec03f9: Remove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 14:54:09 +0000 (14:54 +0000)]
am caec03f9: Remove periods from ignore optimizations summaries

* commit 'caec03f9e51469776242908b4d877d7248c52875':
  Remove periods from ignore optimizations summaries

9 years agoam cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 14:54:08 +0000 (14:54 +0000)]
am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev

* commit 'cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
  Advanced apps updates (2/2)

9 years agoam 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 14:54:07 +0000 (14:54 +0000)]
am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev

* commit '6f9b6e08a80b1d1e114808d1ac42e132888df185':
  Add sd card string, just in case

9 years agoam c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 14:53:56 +0000 (14:53 +0000)]
am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev

* commit 'c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
  Modifications for changes to SettingsLib

9 years agoPass in the netId using intent data, not intent extras.
Lorenzo Colitti [Wed, 10 Jun 2015 13:49:52 +0000 (22:49 +0900)]
Pass in the netId using intent data, not intent extras.

This allows ConnectivityService to use different PendingIntents
for different dialogs; two PendingIntents that differ in their
data are treated as different, but two PendingIntents that differ
only in their extras are treated as being the same.

Bug: 20081183
Change-Id: Ie1bdcf2a0a0747be815ea528db0cb34f5ab415b9

9 years agoReword "no internet access" dialog to conform with mocks.
Lorenzo Colitti [Wed, 10 Jun 2015 06:16:36 +0000 (15:16 +0900)]
Reword "no internet access" dialog to conform with mocks.

Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2

9 years agoImport translations. DO NOT MERGE
Geoff Mendal [Wed, 10 Jun 2015 14:33:59 +0000 (07:33 -0700)]
Import translations. DO NOT MERGE

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

9 years agoMerge "annoint new constants" into mnc-dev
Chris Wren [Wed, 10 Jun 2015 14:14:38 +0000 (14:14 +0000)]
Merge "annoint new constants" into mnc-dev

9 years agoRemove periods from ignore optimizations summaries
Jason Monk [Wed, 10 Jun 2015 13:04:14 +0000 (09:04 -0400)]
Remove periods from ignore optimizations summaries

Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c

9 years agoMerge "Advanced apps updates (2/2)" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:32 +0000 (12:59 +0000)]
Merge "Advanced apps updates (2/2)" into mnc-dev

9 years agoMerge "Add sd card string, just in case" into mnc-dev
Jason Monk [Wed, 10 Jun 2015 12:59:29 +0000 (12:59 +0000)]
Merge "Add sd card string, just in case" into mnc-dev

9 years agoMerge "Modifications for changes to SettingsLib" into mnc-dev
Neil Fuller [Wed, 10 Jun 2015 12:23:45 +0000 (12:23 +0000)]
Merge "Modifications for changes to SettingsLib" into mnc-dev

9 years agoAdd simulated 4K display modes.
Jeff Brown [Wed, 10 Jun 2015 01:25:04 +0000 (18:25 -0700)]
Add simulated 4K display modes.

Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e

9 years agoam bf25b219: am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for...
Fyodor Kupolov [Tue, 9 Jun 2015 23:33:40 +0000 (23:33 +0000)]
am bf25b219: am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev

* commit 'bf25b219ab50e658bf90dc6e88b41c0c7e05e4c2':
  Guest option should not be shown for the guest user

9 years agoam af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user...
Fyodor Kupolov [Tue, 9 Jun 2015 23:23:44 +0000 (23:23 +0000)]
am af27f96b: am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev

* commit 'af27f96bc61ed23658696d440919b286ea4d747a':
  Guest option should not be shown for the guest user

9 years agoam 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 23:06:14 +0000 (23:06 +0000)]
am 8e2c4787: Merge "Guest option should not be shown for the guest user" into mnc-dev

* commit '8e2c47870188c0732a1130b505748f07b23fa66c':
  Guest option should not be shown for the guest user

9 years agoMerge "Guest option should not be shown for the guest user" into mnc-dev
Fyodor Kupolov [Tue, 9 Jun 2015 22:57:26 +0000 (22:57 +0000)]
Merge "Guest option should not be shown for the guest user" into mnc-dev

9 years agoGuest option should not be shown for the guest user
Fyodor Kupolov [Tue, 9 Jun 2015 22:54:28 +0000 (15:54 -0700)]
Guest option should not be shown for the guest user

Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d

9 years agoam fa9fcf11: am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit...
Casper Bonde [Tue, 9 Jun 2015 22:19:53 +0000 (22:19 +0000)]
am fa9fcf11: am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5)

* commit 'fa9fcf119b6e44b1b1deaa8a080baa9e087ef31c':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)