Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,831 Commits 1 Branch 0 Tags
68ce17ff25b497edb7e0ec20a672475b76e604c8
Commit Graph

8554 Commits

Author SHA1 Message Date
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
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
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
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
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
cc0f3b75b2 Merge "Advanced apps updates (2/2)" into mnc-dev 2015-06-10 12:59:33 +00:00
Neil Fuller
c28330ec3e Merge "Modifications for changes to SettingsLib" into mnc-dev 2015-06-10 12:23:49 +00:00
Fyodor Kupolov
bf25b219ab 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
 2015-06-09 23:23:44 +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
Fyodor Kupolov
c478885d8d Guest option should not be shown for the guest user 
Bug: 21649480
Change-Id: I866e34543c6ba396533f9acfef056390cf19608d
 2015-06-09 15:55:01 -07:00
Casper Bonde
fa9fcf119b am b9484071: am e278a208: SAP: Make it possible to enforce a 16-digit pin code (5/5) 
* commit 'b94840712e9257e6f38446c7d7a3c4d3d79cf089':
  SAP: Make it possible to enforce a 16-digit pin code (5/5)
 2015-06-09 22:09:38 +00:00
Casper Bonde
e278a208bc SAP: Make it possible to enforce a 16-digit pin code (5/5) 
This change enable the posibility to enforce using a
16-digit pin or MITM for a RFCOMM or L2CAP connection.

This is needed for the SIM access profile.

Change-Id: I6bb2b0dff1ebf4b4f1d8faad97aa7c480000d3ea
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
 2015-06-09 21:42:15 +00:00
Jason Monk
ba0e2c8688 Advanced apps updates (2/2) 
Change the title of the screen, add a category to break things up

Bug: 21372377
Change-Id: I03c2060937f540235755e4b74c5634543e526d25
 2015-06-09 16:01:28 -04:00
Chris Wren
ca689aeada annoint new constants 
Bug: 21114836
Change-Id: I63fb1da67a6f6d8dfad076e7e1c2cef0783c17f9
 2015-06-09 14:24:03 -04:00
Tony Mantler
d1e9671f57 am 20296c96: am 8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev 
* commit '20296c966023a1fc3ae5b08950fc6a36becd8bf1':
  Move ApplicationsState to SettingsLib
 2015-06-09 17:46:51 +00:00
Tony Mantler
8c39a9c6f2 Merge "Move ApplicationsState to SettingsLib" into mnc-dev 2015-06-09 17:20:25 +00:00
Chris Wren
49203c0bd2 am 455b27ee: am c7581e81: instrument display rotation settings 
* commit '455b27eee06ff6577453936e531186caca000d56':
  instrument display rotation settings
 2015-06-09 16:44:16 +00:00
Chris Wren
0daeb1374b am 5d66e170: am 18213459: don\'t double set the dropdown value 
* commit '5d66e17002053fe759c47cb5aae26f70e677e248':
  don't double set the dropdown value
 2015-06-09 16:44:15 +00:00
Chris Wren
c7581e8126 instrument display rotation settings 
Bug: 21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
 2015-06-09 12:10:15 -04:00
Chris Wren
182134595b don't double set the dropdown value 
idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.

This makes it hard to count actual user interactions without counting the initialization.

Bug: 21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec
 2015-06-09 12:09:44 -04:00
Jim Miller
0f90a53f39 am 6b176ce8: am fa47bc02: Update and cleanup FingerprintManager API to new spec 
* commit '6b176ce80d95efcd3058d463a26fce870e146466':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:01:35 +00:00
Neil Fuller
b986442747 Modifications for changes to SettingsLib 
See associated changes in frameworks/base for details.

Bug: 19058953
Bug: https://code.google.com/p/android-developer-preview/issues/detail?id=2132
Change-Id: Ic3393df28dd63ca75b203d1d0430d69cab7c40de
 2015-06-09 10:10:56 +01:00
Makoto Onuki
375c3a080e Show list of permissions instead of just numbers 
Bug 21615746

Change-Id: I23439b3571f10d6d396174025a19b5ebb585dee9
 2015-06-08 17:48:46 -07:00
Jim Miller
fa47bc0290 Update and cleanup FingerprintManager API to new spec 
Fixes bug 21040383

Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
 2015-06-08 17:17:44 -07:00
Tony Mantler
67cd6ab93a Move ApplicationsState to SettingsLib 
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings

b/21328967

Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
 2015-06-08 14:41:02 -07:00
John Spurlock
541e5c410c am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '1b76e7904744a4cde25af73ff9b378d3a765c640':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:28:59 +00:00
John Spurlock
9a58361076 Merge "Settings: Update notification listener user prompt strings." into mnc-dev 2015-06-08 21:04:19 +00:00
John Spurlock
90e27a4893 Settings: Update notification listener user prompt strings. 
Bug: 20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
 2015-06-08 16:50:36 -04:00
Alex Klyubin
ae86002ad9 am ddd4d074: am abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 
* commit 'ddd4d074380d51d3ca5c83cd1067efa95a2855e3':
  Switch from KeyStore.saw to KeyStore.list.
 2015-06-08 18:38:14 +00:00
Alex Klyubin
abe74683c1 Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 2015-06-08 18:11:23 +00:00
John Spurlock
2268450147 am 7db10639: am 178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 
* commit '7db1063958b8192237dec6ffa2de2092ccd0f486':
  Settings: Update DND access dialog to new user flow.
 2015-06-08 17:04:17 +00:00
Martijn Coenen
a048b2c76a am 4504eb36: am 1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev 
* commit '4504eb36be7932bbd3fe1c9e0759ef7231dbb70d':
  Add NFC payment "how it works" screens.
 2015-06-08 17:04:15 +00:00
Martijn Coenen
73f95c4389 am dcf324c0: am 63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev 
* commit 'dcf324c0b3917c8d9007a58bc35591c75793c422':
  NFC: don't use dynamic resources.
 2015-06-08 17:04:14 +00:00
John Spurlock
178d46a9b5 Merge "Settings: Update DND access dialog to new user flow." into mnc-dev 2015-06-08 16:39:33 +00:00
Alex Klyubin
3848407d0c Switch from KeyStore.saw to KeyStore.list. 
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.

Bug: 18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
 2015-06-08 09:30:08 -07:00
John Spurlock
a00194d998 Settings: Update DND access dialog to new user flow. 
- Only list apps in the DND access list that have included
   the corresponding permission in their manifest.
 - Show a scary user warning before enabling access per app.
 - Update manifest to follow framework intent action rename.

Bug: 21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
 2015-06-08 12:27:03 -04:00
Martijn Coenen
1276b21317 Merge "Add NFC payment "how it works" screens." into mnc-dev 2015-06-08 08:02:30 +00:00