PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,512 Commits 1 Branch 0 Tags
1d0667a07b09771cca05f0d6f7d89c018ff88575
Commit Graph

7426 Commits

Author SHA1 Message Date
John Spurlock
49300d19ab Settings: Update preference summary per new downtime behavior. 
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
 2014-11-10 14:49:10 -05:00
Jeff Davidson
f9c285896c am a8b154f2: am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 
* commit 'a8b154f2f04c6130a65c0b45947e01a896e47cd9':
  Don't allow secondary users to change Wi-Fi assistants.
 2014-11-10 17:50:08 +00:00
Jeff Davidson
76f0133831 Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev 2014-11-10 17:35:29 +00:00
Alexandra Gherghina
513b2cb97e am ac62d700: am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 
* commit 'ac62d70080140b8068e93ba43d3de167f5ac16d2':
  Update sync state immediately after accounts are shown
 2014-11-10 10:28:47 +00:00
Alexandra Gherghina
095521b287 Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev 2014-11-10 10:13:00 +00:00
Paul Crowley
74d7841f24 am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f 
automerge: 2e6a170

* commit '2e6a170aa579a05b120d5b8c6d56250bbed54674':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-08 13:58:42 +00:00
Paul Crowley
6bd45c0eba am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35 
automerge: 0475a3c

* commit '0475a3ccc508b0c61b23733f0ec27110910e21b2':
  Use the right message for pattern/password.
 2014-11-08 03:18:47 +00:00
vandwalle
8be7ee3aac dont blacklist wifi config that have had validated internet status in the past 
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
 2014-11-07 19:01:58 -08:00
Paul Crowley
2555e5f104 Prevent factory reset for short passwords in CryptKeeper 
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java
 2014-11-08 01:43:45 +00:00
Paul Crowley
c44ad35e51 Merge "Use the right message for pattern/password." into lmp-mr1-dev 2014-11-08 01:13:11 +00:00
Stuart Scott
928052ebe8 am 48471e39: am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit '48471e397e6e63a72e0ff80df5bba9700d6f9cba':
  Update SubInfoRecord usage
 2014-11-08 00:25:17 +00:00
Paul Crowley
a8c760691d Use the right message for pattern/password. 
Bug: 17875087
Change-Id: I7729a4fcb993def912e950ad0ea59fd64bfc34d3
 2014-11-07 23:54:56 +00:00
Stuart Scott
4d1a0165b4 Update SubInfoRecord usage 
bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
 2014-11-07 23:53:56 +00:00
PauloftheWest
2d17937e10 am cd16c4bb: am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 
* commit 'cd16c4bb0404b4e2e90ac3f802b4fc71e55055a4':
  Migrated search for SubInfoRecord to Utils.
 2014-11-07 22:48:04 +00:00
PauloftheWest
5aafdda85c Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 2014-11-07 22:28:47 +00:00
PauloftheWest
0a0dacaf17 Migrated search for SubInfoRecord to Utils. 
Bug: 18293625
Bug: 18293168
Bug: 18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
 2014-11-07 14:26:22 -08:00
Jeff Davidson
739ae972d0 Don't allow secondary users to change Wi-Fi assistants. 
This is not ideal but better than the current situation given that the
rest of the connectivity stack does not properly support multi-user.

Bug: 17320659
Change-Id: Ia0d4c746b4ebe6ce90df7ff39f0398ca78fd61f6
 2014-11-07 13:26:56 -08:00
Sanket Padawe
4f8844057f am a66826e3: am 80b7a2e4: am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 
* commit 'a66826e387d158ac9e018aab0d82782377269756':
  Set default sim name and carrier name from subinforecord object.
 2014-11-07 20:09:38 +00:00
Sanket Padawe
b58119b709 Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 2014-11-07 19:47:45 +00:00
Fabrice Di Meglio
5540ed56a3 am fbacdbdc: am 330fc418: am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit 'fbacdbdc5f2aba513782ce2879d0e3ebef5f966b':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:34:26 +00:00
Fabrice Di Meglio
d4006a4cbf am e8b40c95: am d762aaab: am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit 'e8b40c950bc76ab175f3eccff73543d891301a4c':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:34:25 +00:00
Fabrice Di Meglio
293d974482 Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 2014-11-07 19:14:04 +00:00
Fabrice Di Meglio
2a4f034da4 Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 2014-11-07 19:13:27 +00:00
Sanket Padawe
d21b45e01c Set default sim name and carrier name from subinforecord object. 
Changes for retrieving display name and carrier name from subinforecord
object.

Bug: 18247211
Bug: 17732079
Bug: 17321641
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543

Conflicts:
	src/com/android/settings/sim/SimSettings.java
 2014-11-07 18:06:49 +00:00
Alexandra Gherghina
6002ff8dce Update sync state immediately after accounts are shown 
Bug: 18251114
Change-Id: I13791ff3979ce862e11989a3819f2356be32a0f4
 2014-11-07 15:24:28 +00:00
Alexandra Gherghina
b057bd73ca am bea0f7f9: am a4a7b739: am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 
* commit 'bea0f7f9a0043b9a5b93a7fa1615d332a61dd7e3':
  Disable app notifications checkbox for uninstalled apps
 2014-11-07 10:48:44 +00:00
Alexandra Gherghina
c66eb698a9 Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 2014-11-07 10:35:53 +00:00
Alexandra Gherghina
51ea7cf4dc Disable app notifications checkbox for uninstalled apps 
Bug: 18253810
Change-Id: I99fb2ae34b16944fd839db4e7c380b2d32f3b85d
 2014-11-07 10:05:59 +00:00
Fabrice Di Meglio
d103e453c6 am 981ab4b2: am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit '981ab4b2f194c52f4401b3c6e55fb9549204e051':
  Update synonyms and fix some issues related to them
 2014-11-07 04:17:46 +00:00
Paul Crowley
a03cd588d2 am 0844554f: am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '0844554f82b0db64cb2eeb8f0aac681edb7ad6f6':
  Add a new flow for decryption checking.
 2014-11-07 04:15:35 +00:00
Jeff Davidson
568d156089 am 0fc9271b: am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card. 
* commit '0fc9271b21b46b6972dcf0e976d20605042b0b38':
  Remove the Wi-Fi Assistant card.
 2014-11-07 04:12:59 +00:00
Fabrice Di Meglio
fff7e020e8 Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 2014-11-07 01:39:25 +00:00
Fabrice Di Meglio
fe144d7b72 Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted 
- dismiss keyboard when the query is submitted by returning the correct value to
onQueryTextSubmit()

Change-Id: I3da0606ea7c5e65c860784a867a54ad30589b3a7
 2014-11-06 17:36:28 -08:00
Fabrice Di Meglio
d34dd4fb9e Update synonyms and fix some issues related to them 
- update synonyms definitions
- fix issue with L release regression for indexing "Backup & reset":
was missing the marker interface "Indexable"
- fix non working synonyms for "Language & input": their declaration
was done in the XML preference file but was not used because the
SearchIndexProvider was built "by hand"

See bug #17474866 Settings search synonyms needs an update

Change-Id: Iceab71a0e3214f3a8ba0dcd77756c3632609c5ce
 2014-11-06 16:57:04 -08:00
Paul Crowley
41c1977978 Merge "Add a new flow for decryption checking." into lmp-mr1-dev 2014-11-07 00:26:45 +00:00
Fabrice Di Meglio
b81e7937b3 Fix bug #17936169 subsettings activity crashes on emulator for android-21 
- prevent the NPE by checking if the UsbManager is not null

Change-Id: I65114ffe66f90d6de66bb98ad841df64840278ce
 2014-11-06 15:16:09 -08:00
Jeff Davidson
99f191f585 Remove the Wi-Fi Assistant card. 
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.

Bug: 13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
 2014-11-06 13:30:34 -08:00
Stuart Scott
38211d1d23 am 65ea49a2: am 74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: ac61828 
* commit '65ea49a2fb8363dd57ac2d881a4c34af70e07c7c':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 21:08:03 +00:00
Stuart Scott
ac61828bed Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 2014-11-06 18:25:50 +00:00
Paul Crowley
529834dae1 Add a new flow for decryption checking. 
Bug: 17875087

Change-Id: I78ba98901bc74ae654414c0a4a303b104a629965
 2014-11-06 15:49:39 +00:00
Jeff Davidson
3959e9b933 am 7b17e24d: am a9086ee9: Show accurate connection status for ephemeral networks. automerge: b46a919 
* commit '7b17e24d36e5fd3263204a4ee666e85a4a006b90':
  Show accurate connection status for ephemeral networks.
 2014-11-06 02:27:33 +00:00
Stuart Scott
7928cd85dc Fix NPE when parceling SubInfoRecord 
bug:18256375
Change-Id: I04ab5086e3f06abc6ce44ef69501022564a95b88
 2014-11-05 15:08:16 -08:00
Jeff Davidson
b46a9194fe Show accurate connection status for ephemeral networks. 
Configurations for these networks are not returned in
getConfiguredNetworks() and likely shouldn't be as clients of this API
would not expect them. (Note also that the ephemeral bit is marked
@hide). But the framework may connect to them regardless.

In these cases, as long as the connection status is something other
than the coarse-level DISCONNECTED, we show the status to be an
accurate representation of Wi-Fi state. (To make this possible, we
pass around the full NetworkInfo instead of just the DetailedState,
allowing us to get the coarse state where needed).

When long pressing on a non-DISCONNECTED ephemeral network, we offer
the ability to save the configuration. (Note that this flow is
currently broken and being tracked by another bug, but the behavior is
consistent with what happens when you simply click on the SSID).

Bug: 18205278
Change-Id: I30592c89546068c796f458a86bb26eb3b28c64df
 2014-11-05 15:04:14 -08:00
Sanket Padawe
db9366ad60 am 88bcd116: am 0d482f24: am 815c61d7: Merge "Change for setting transparency of sim colors." into lmp-mr1-dev 
* commit '88bcd116eb74ceb9756b71e9e208c25c41c98b7a':
  Change for setting transparency of sim colors.
 2014-11-05 20:53:39 +00:00
John Spurlock
6358a4f1b6 am bdeb3b9b: am 2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge: 92f0246 
* commit 'bdeb3b9beed36d4c62255961c358d23071e6687b':
  Settings: Allow user to configure "None" for downtime.
 2014-11-05 20:53:38 +00:00
Sanket Padawe
815c61d729 Merge "Change for setting transparency of sim colors." into lmp-mr1-dev 2014-11-05 20:30:26 +00:00
John Spurlock
92f02463fc Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev 2014-11-05 19:17:50 +00:00
Sanket Padawe
237b24e2f3 am 55674c31: am bac2d4d6: am 63530b56: Merge "Sim name doesn\'t persist on reboot" into lmp-mr1-dev 
* commit '55674c31aab544f3856f2ff23f26745b8bcb65c3':
  Sim name doesn't persist on reboot
 2014-11-05 19:07:23 +00:00
Andres Morales
4610421f40 am 7d3e182c: Merge changes I326a4cf2,I1cfce513 into lmp-mr1-dev automerge: ea4d9a9 automerge: eb55ac9 
* commit '7d3e182c18978c7da43194d9deb564e5724b06e2':
  Confirm enabling OEM unlock with warning dialog
  Request PIN confirmation to enable OEM unlock
 2014-11-05 18:48:07 +00:00
Paul Crowley
40f17dbed9 am 1e4d6e64: Merge "Don\'t show a pattern-specific prompt at encryption time." into lmp-mr1-dev automerge: e6ad7bf automerge: 966a1ca 
* commit '1e4d6e64a43a1eb5de893a71178c64d240d01f9f':
  Don't show a pattern-specific prompt at encryption time.
 2014-11-05 18:48:06 +00:00