Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,166 Commits 1 Branch 0 Tags
08057f035d6310b2947aa0ba5a55ed0ee8159daa
Commit Graph

8667 Commits

Author SHA1 Message Date
Jeff Sharkey
08057f035d am bfd717b1: am 3b47da58: am 680329f1: Follow string refactoring. 
* commit 'bfd717b150301ef57e5fc10ff6eb2e954256f9d0':
  Follow string refactoring.
 2015-06-11 05:56:18 +00:00
Lajos Molnar
8f45270634 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
 2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc 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)
 2015-06-11 05:56:12 +00:00
Lucky Zhang
34eaaa01fa 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
 2015-06-11 05:56:10 +00:00
Jeff Sharkey
bfd717b150 am 3b47da58: am 680329f1: Follow string refactoring. 
* commit '3b47da581b2c05f00a2d9f5d3cd0f10fb786c7e6':
  Follow string refactoring.
 2015-06-11 02:53:17 +00:00
Lajos Molnar
204f4068f7 am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit 'f7192038dc7973c2492dc4eadcad6f5e03207ff4':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 02:53:15 +00:00
Jorim Jaggi
6dd8e039da 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)
 2015-06-11 02:53:13 +00:00
Lucky Zhang
234c4c6c7c 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
 2015-06-11 02:53:12 +00:00
Nick Kralevich
d01f0d91ef 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.
 2015-06-11 01:34:11 +00:00
Jason Monk
938ffbf0dc 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
 2015-06-11 01:34:10 +00:00
Jason Monk
f14f4509f9 am 24da8529: am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev 
* commit '24da85296897a4130961491978e7b339e5f77a37':
  App storage settings - Request size onResume
 2015-06-11 01:34:09 +00:00
Jason Monk
25326207d3 am 68ce17ff: am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit '68ce17ff25b497edb7e0ec20a672475b76e604c8':
  New dialog for ignore battery optimizations
 2015-06-11 01:34:07 +00:00
Jeff Sharkey
680329f10c Follow string refactoring. 
Change-Id: Ib450724a20283a3bf356593e487b8ee6e9c8de5c
 2015-06-10 17:27:44 -07:00
Lajos Molnar
63504d8326 Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 2015-06-10 23:23:49 +00:00
Nick Kralevich
54d37cddc6 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.
 2015-06-10 23:16:38 +00:00
Jason Monk
3b145d9086 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
 2015-06-10 23:15:36 +00:00
Jason Monk
24da852968 am ac6bb3c2: am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev 
* commit 'ac6bb3c23b6d2e0b4bd6003a3c6fbda8f6ba0a0c':
  App storage settings - Request size onResume
 2015-06-10 23:15:30 +00:00
Jason Monk
68ce17ff25 am 3de2cf4b: am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit '3de2cf4b2f0cae4b6a86f612f71620dda6495c0c':
  New dialog for ignore battery optimizations
 2015-06-10 23:15:28 +00:00
Jorim Jaggi
ed76e59e49 Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 2015-06-10 23:10:08 +00:00
Lucky Zhang
34450932b2 Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev 2015-06-10 23:01:26 +00:00
Jorim Jaggi
ff41a9a5a6 Animations/success state for external confirm device credentials (2/2) 
Bug: 20929186
Change-Id: I4489dd37f1148fb03315ec337a546eee04660cb5
 2015-06-10 15:17:24 -07:00
Lajos Molnar
ee55eac297 developer settings: remove "Use deprecated AwesomePlayer" settings 
Bug: 17108024
Change-Id: I602eba3214cacef7435ce6347e885c040d5c443c
 2015-06-10 15:00:13 -07:00
Nick Kralevich
8da8e52874 Merge "Fix USB access control when adb is disabled." into mnc-dev 2015-06-10 21:11:35 +00:00
Jason Monk
a576d55a0e Merge "Hide tap to wake on devices that don't support it" into mnc-dev 2015-06-10 20:26:12 +00:00
Jason Monk
181e0e9ec0 Hide tap to wake on devices that don't support it 
Bug: 21650579
Change-Id: I3fbcccc80b5773c74d8398f1d23b4762a5bf54ed
 2015-06-10 16:16:10 -04:00
Jason Monk
dc748cb38a Merge "App storage settings - Request size onResume" into mnc-dev 2015-06-10 20:12:07 +00:00
Jason Monk
ece9d5145f App storage settings - Request size onResume 
Our data might be stale (especially when coming from manage space
activities).

Bug: 21680510
Change-Id: Ifb919e05f23f76677b6de2aff3d13d00e195facb
 2015-06-10 16:08:01 -04:00
Jason Monk
d09be7ed30 Merge "New dialog for ignore battery optimizations" into mnc-dev 2015-06-10 20:06:12 +00:00
Jason Monk
3a90d7cc69 New dialog for ignore battery optimizations 
Bug: 21375688
Change-Id: I7240cc0615044cf5a34349e5ffdf2ae2e0f6333f
 2015-06-10 15:49:36 -04:00
Lucky Zhang
1bb5648595 [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
 2015-06-10 12:42:15 -07:00
Xiyuan Xia
beba0efa14 am 67b438b1: am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit '67b438b1185f6d11712ee9c962066c1651479507':
  Implement default assist app setting
 2015-06-10 17:47:59 +00:00
Xiyuan Xia
67b438b118 am a218ebb0: am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit 'a218ebb090e3ac06d5c324bafb89e2d4d3ef7741':
  Implement default assist app setting
 2015-06-10 17:32:43 +00:00
Nick Kralevich
5eba30289a 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
 2015-06-10 10:24:05 -07:00
Makoto Onuki
b5fcfcafac 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
 2015-06-10 17:21:00 +00:00
Lorenzo Colitti
335afcbb6c 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.
 2015-06-10 17:13:29 +00:00
Jason Monk
774ae1cf37 am 8ff3e055: am fba2680e: am f9402321: Fix legal info back button 
* commit '8ff3e055b09c03295b87654d7bf3430e792772ce':
  Fix legal info back button
 2015-06-10 17:13:27 +00:00
Chris Wren
a16c9c73e6 am 5b11ad26: am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit '5b11ad2666227146db5983e7ea0073bc0cc12bd4':
  annoint new constants
 2015-06-10 17:13:02 +00:00
Jason Monk
ef2dadb7f8 am 6dc33a5a: am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '6dc33a5ac7a2352be62b75edf1afc399821b38af':
  Advanced apps updates (2/2)
 2015-06-10 17:13:00 +00:00
Neil Fuller
e8408a00b4 am db8d0a9a: am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit 'db8d0a9a370a55010d1d2d4e1efb06b7a02bedb3':
  Modifications for changes to SettingsLib
 2015-06-10 17:12:57 +00:00
Xiyuan Xia
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +00:00
Makoto Onuki
2f951024e4 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
 2015-06-10 17:00:06 +00:00
Makoto Onuki
0bd18745cf Merge "Show list of permissions instead of just numbers" into mnc-dev 2015-06-10 16:39:07 +00:00
Lorenzo Colitti
24f4829994 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.
 2015-06-10 15:56:36 +00:00
Jason Monk
8ff3e055b0 am fba2680e: am f9402321: Fix legal info back button 
* commit 'fba2680ebb63f0195b3267b7dec8d9cc413896fd':
  Fix legal info back button
 2015-06-10 15:56:34 +00:00
Xiyuan Xia
86a554091d 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
 2015-06-10 08:43:28 -07:00
Lorenzo Colitti
275e6f7520 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.
 2015-06-10 15:25:27 +00:00
Chris Wren
5b11ad2666 am fa8889a8: am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'fa8889a88c162595b8cac8d2749dff401a5ea39c':
  annoint new constants
 2015-06-10 15:11:55 +00:00
Jason Monk
6dc33a5ac7 am 5b23db3c: am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit '5b23db3ce61e5d2e43bb0f0757cf823c2d8f3d4d':
  Advanced apps updates (2/2)
 2015-06-10 15:11:53 +00:00
Neil Fuller
db8d0a9a37 am 54786a6a: am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit '54786a6adf695dcc1378bdbfc261590c91d0199a':
  Modifications for changes to SettingsLib
 2015-06-10 15:11:47 +00:00
Jason Monk
f94023216a Fix legal info back button 
Make it its own SettingsPreferenceFragment.

whitespace--

Bug: 20727881
Change-Id: I1f790af03d316c1d43377a6d8606084d9f3a747f
 2015-06-10 11:05:02 -04:00