PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,764 Commits 1 Branch 0 Tags
a8491f348ef1a1f10278a83bb33b2b38723fb30c
Commit Graph

20764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d9bd6a6576 am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev 
* commit '8da8e528748fccf4b2291536592648a8e99a36d6':
  Fix USB access control when adb is disabled.
 2015-06-10 21:25:35 +00: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
c58845442a 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
 2015-06-10 20:38:52 +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
ac6bb3c23b am dc748cb3: Merge "App storage settings - Request size onResume" into mnc-dev 
* commit 'dc748cb38ac79fb445d7bbba6f8220a85820d03a':
  App storage settings - Request size onResume
 2015-06-10 20:14:35 +00:00
Jason Monk
3de2cf4b2f am d09be7ed: Merge "New dialog for ignore battery optimizations" into mnc-dev 
* commit 'd09be7ed30d2ed4f3298c3075f506612b91a5878':
  New dialog for ignore battery optimizations
 2015-06-10 20:14:34 +00: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
ef77eb2ecc am f8d131e1: Add string for profile owner usage access warning 
* commit 'f8d131e181a273ed8664222e754b10a5824d56ac':
  Add string for profile owner usage access warning
 2015-06-10 19:55:01 +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
Jeff Brown
f7b9a0217c am f8f9088a: Merge "Add simulated 4K display modes." into mnc-dev 
* commit 'f8f9088a6def1186038c35ec3319113262825f20':
  Add simulated 4K display modes.
 2015-06-10 19:33:02 +00:00
Jason Monk
f8d131e181 Add string for profile owner usage access warning 
Bug: 20751702
Change-Id: Ib885befdefa18d21a243478d59b1d240bc7a1c68
 2015-06-10 15:29:22 -04:00
Jeff Brown
f8f9088a6d Merge "Add simulated 4K display modes." into mnc-dev 2015-06-10 19:21:15 +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
Xiyuan Xia
a218ebb090 am 9823f279: Merge "Implement default assist app setting" into mnc-dev 
* commit '9823f27936d07ef1f7ce0d79eca39c3f053d3e62':
  Implement default assist app setting
 2015-06-10 17:21:01 +00:00
Xiyuan Xia
9823f27936 Merge "Implement default assist app setting" into mnc-dev 2015-06-10 17:08:44 +00:00
Makoto Onuki
c81dad78ea am 0bd18745: Merge "Show list of permissions instead of just numbers" into mnc-dev 
* commit '0bd18745cff354f6994b70e71f3ab6b7e98fe004':
  Show list of permissions instead of just numbers
 2015-06-10 16:51:24 +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
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
a41c3580a9 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.
 2015-06-10 15:42:35 +00:00
Geoff Mendal
f0e5a75508 am 3e0514d7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '3e0514d7464c8da8fb4ce7fb132410cb53573bef':
  Import translations. DO NOT MERGE
 2015-06-10 15:42:34 +00:00
Jason Monk
fba2680ebb am f9402321: Fix legal info back button 
* commit 'f94023216accd128b06acdc50950e455a60a9c4e':
  Fix legal info back button
 2015-06-10 15:42:16 +00: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
Geoff Mendal
3e0514d746 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 15:25:02 +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
Geoff Mendal
f61a092711 Import translations. DO NOT MERGE 
Change-Id: I7e0cc3842d3422193de12b6b718237995f25db68
Auto-generated-cl: translation import
 2015-06-10 08:04:57 -07:00
Chris Wren
fa8889a88c am da6a4904: Merge "annoint new constants" into mnc-dev 
* commit 'da6a4904a9b6370b9a4ceeab6f8ecc08738a2c7b':
  annoint new constants
 2015-06-10 14:54:38 +00:00
Jason Monk
5365a8fd3a am caec03f9: Remove periods from ignore optimizations summaries 
* commit 'caec03f9e51469776242908b4d877d7248c52875':
  Remove periods from ignore optimizations summaries
 2015-06-10 14:54:09 +00:00
Jason Monk
5b23db3ce6 am cc0f3b75: Merge "Advanced apps updates (2/2)" into mnc-dev 
* commit 'cc0f3b75b2692c7b57b2e839b18d224ed51f8082':
  Advanced apps updates (2/2)
 2015-06-10 14:54:08 +00:00
Jason Monk
6c6a212f03 am 6f9b6e08: Merge "Add sd card string, just in case" into mnc-dev 
* commit '6f9b6e08a80b1d1e114808d1ac42e132888df185':
  Add sd card string, just in case
 2015-06-10 14:54:07 +00:00
Neil Fuller
54786a6adf am c28330ec: Merge "Modifications for changes to SettingsLib" into mnc-dev 
* commit 'c28330ec3e6e808427cc17fd4060c3c0a7fa3462':
  Modifications for changes to SettingsLib
 2015-06-10 14:53:56 +00:00
Lorenzo Colitti
c6d997271a Add a string for switching to cell when Wi-Fi loses backhaul. 
We have not yet decided whether to surface this setting, but
we need to get it in before string freeze in case we do want to
expose it.

Bug: 20896761
Change-Id: I1c99229a284a0ae86ab191ae90a7dff497984fea
 2015-06-10 23:38:19 +09:00
Lorenzo Colitti
2593589209 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
 2015-06-10 23:38:16 +09:00
Lorenzo Colitti
dcc6155426 Reword "no internet access" dialog to conform with mocks. 
Bug: 20081183
Bug: 20739299
Change-Id: I63e58dafcba879c56669766f652729a73ef722e2
 2015-06-10 23:38:09 +09:00
Chris Wren
da6a4904a9 Merge "annoint new constants" into mnc-dev 2015-06-10 14:14:45 +00:00
Jason Monk
caec03f9e5 Remove periods from ignore optimizations summaries 
Bug: 21375688
Change-Id: Id37cbac60db461bfc0da505ad5d4346382c8e76c
 2015-06-10 09:04:14 -04:00
Jason Monk
cc0f3b75b2 Merge "Advanced apps updates (2/2)" into mnc-dev 2015-06-10 12:59:33 +00:00
Jason Monk
6f9b6e08a8 Merge "Add sd card string, just in case" into mnc-dev 2015-06-10 12:59:30 +00:00
Neil Fuller
c28330ec3e Merge "Modifications for changes to SettingsLib" into mnc-dev 2015-06-10 12:23:49 +00:00
The Android Automerger
3f94f562c1 merge in mnc-release history after reset to mnc-dev 2015-06-10 01:04:19 -07:00
Jeff Brown
b18130c0df Add simulated 4K display modes. 
Bug: 18241736
Change-Id: Ic56a756601dd1cc1bf125fe30965f80d63d92b4e
 2015-06-09 19:52:24 -07:00
Fyodor Kupolov
af27f96bc6 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
 2015-06-09 23:06:14 +00:00
Fyodor Kupolov
8e2c478701 Merge "Guest option should not be shown for the guest user" into mnc-dev 2015-06-09 22:57:27 +00:00