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

8632 Commits

Author SHA1 Message Date
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
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
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
1f95d23015 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
 2015-06-09 23:33:40 +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
4bc913b7c5 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)
 2015-06-09 22:19:53 +00: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
47431a47ba am d1e9671f: am 20296c96: am 8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev 
* commit 'd1e9671f570f516412dbf65d1cdf96c3043bf7aa':
  Move ApplicationsState to SettingsLib
 2015-06-09 17:59:29 +00: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
c2bc3e7dc3 am 49203c0b: am 455b27ee: am c7581e81: instrument display rotation settings 
* commit '49203c0bd29be53cbbfd56fc22aaf3b1a2ed5695':
  instrument display rotation settings
 2015-06-09 17:03:03 +00:00
Chris Wren
4837d2bdcf am 0daeb137: am 5d66e170: am 18213459: don\'t double set the dropdown value 
* commit '0daeb1374bf007b75b211eb7bab62be17fe2ea10':
  don't double set the dropdown value
 2015-06-09 17:03:02 +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
079dc6e8ee am 0f90a53f: am 6b176ce8: am fa47bc02: Update and cleanup FingerprintManager API to new spec 
* commit '0f90a53f3906a1ebc632e3dd99949dbb4c54431c':
  Update and cleanup FingerprintManager API to new spec
 2015-06-09 13:16:27 +00: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
6b600d972d am 541e5c41: am 1b76e790: am 9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev 
* commit '541e5c410cbb87d168faed5da411447390acd63d':
  Settings: Update notification listener user prompt strings.
 2015-06-08 21:39:36 +00: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
8e46bcc637 am ae86002a: am ddd4d074: am abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev 
* commit 'ae86002ad9cf6ff90894b1ca9224d85e985630ff':
  Switch from KeyStore.saw to KeyStore.list.
 2015-06-08 19:58:10 +00: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