PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,233 Commits 1 Branch 0 Tags
87015c0166d84b86fd1067f7e4effbe898b60c7c
Commit Graph

16233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fca698cbeb am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev 
* commit 'ab82c090d1f4549a256d4550b71c540b216e0a65':
  Update SubInfoRecord usage
 2014-11-08 00:15:54 +00:00
Stuart Scott
ab82c090d1 Merge "Update SubInfoRecord usage" into lmp-mr1-dev 2014-11-08 00:09:21 +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
Fabrice Di Meglio
3c05c164bf am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev 
* commit 'd9966523f0c5dc3c3a68c5e0ecfb1a0b1f2bca70':
  Fix bug #18289076 Storage graph colors don't match Material design spec
 2014-11-07 23:12:30 +00:00
Fabrice Di Meglio
d9966523f0 Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev 2014-11-07 23:07:05 +00:00
Fabrice Di Meglio
e7ed65602b Fix bug #18289076 Storage graph colors don't match Material design spec 
- update colors per UX request for matching Material Design colors spec

Change-Id: Ibee52ee0edef2d678d86e3960cd7ff058476a25e
 2014-11-07 14:46:20 -08:00
PauloftheWest
7be191843a am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev 
* commit '5aafdda85ccfb0e3ad46a7ab0bac592893bddde8':
  Migrated search for SubInfoRecord to Utils.
 2014-11-07 22:36:01 +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
80b7a2e422 am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev 
* commit 'b58119b709acd370b722659a12ebc75bd9a32a4c':
  Set default sim name and carrier name from subinforecord object.
 2014-11-07 19:58:11 +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
330fc41823 am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit '293d974482c89b9886f9451423f4619e23b5b186':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:18:17 +00:00
Fabrice Di Meglio
d762aaabd2 am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit '2a4f034da4fa1a51e5a254942436d57facd4005b':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:18:16 +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
Jason Monk
dac36fafbe am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'cc0a2c554a8a576df2dbf4f564970cd67cd34e77':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:02:03 +00:00
Jason Monk
cc0a2c554a Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 2014-11-07 16:58:37 +00:00
Jason Monk
d570e9839e Screen pinning: fix strings and add scrollview 
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.

Bug: 18287056
Bug: 17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
 2014-11-07 11:46:33 -05: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
Baligh Uddin
00585e420a am 5d6b47c1: (-s ours) am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '5d6b47c1a21bd3d283f95aae4671b3667f511515':
  Import translations. DO NOT MERGE
 2014-11-07 15:15:36 +00:00
Baligh Uddin
5d6b47c1a2 am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '960c98f91d44a9f9dfa5276f62e55f16e557e685':
  Import translations. DO NOT MERGE
 2014-11-07 15:08:07 +00:00
Baligh Uddin
886ac25c69 am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '449dc733e313b889a159a8776bd09cacbc0c34ae':
  Import translations. DO NOT MERGE
 2014-11-07 15:06:32 +00:00
Baligh Uddin
449dc733e3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:03:15 +00:00
Baligh Uddin
5fbfdc83e4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:03:01 +00:00
Alexandra Gherghina
a4a7b739ac am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 
* commit 'c66eb698a9e5e4b6e684ba38a92e7c0ce8bd596a':
  Disable app notifications checkbox for uninstalled apps
 2014-11-07 10:39:43 +00:00
Alexandra Gherghina
fcb880c6d1 am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit 'ee70c69919d3e49ba76d2710850fd70be5c09998':
  Update text for apps installed for other users
 2014-11-07 10:39:42 +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
ee70c69919 Merge "Update text for apps installed for other users" into lmp-mr1-dev 2014-11-07 10:35:38 +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
Alexandra Gherghina
d9ed84375d Update text for apps installed for other users 
This also refactors the layout to accommodate longer text

Bug: 16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
 2014-11-07 10:05:49 +00:00
Fabrice Di Meglio
a581a16dcd am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit 'fff7e020e83b1f23de11a842c56728f8a739a8d1':
  Update synonyms and fix some issues related to them
 2014-11-07 01:46:20 +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
83b4fac50a am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '41c197797832efd2acee013c0079fe7850559795':
  Add a new flow for decryption checking.
 2014-11-07 00:33:42 +00:00
Paul Crowley
41c1977978 Merge "Add a new flow for decryption checking." into lmp-mr1-dev 2014-11-07 00:26:45 +00:00
Jeff Davidson
c4a686086c am 99f191f5: Remove the Wi-Fi Assistant card. 
* commit '99f191f5856bb266854d7b08a50523626eb70f72':
  Remove the Wi-Fi Assistant card.
 2014-11-07 00:09:36 +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
7492442451 Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 
automerge: ac61828

* commit 'ac61828bed8219b94afe4fe2f32cae6ef70130c0':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 18:54:42 +00:00
Stuart Scott
ac61828bed Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev 2014-11-06 18:25:50 +00:00
Baligh Uddin
960c98f91d Import translations. DO NOT MERGE 
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
 2014-11-06 09:49:04 -08:00
Baligh Uddin
03fb1255ce Import translations. DO NOT MERGE 
Change-Id: I3b866f948797d2f710f53ce51aaa54b373a346e0
Auto-generated-cl: translation import
 2014-11-06 09:42:35 -08:00
Baligh Uddin
039b456e1f Import translations. DO NOT MERGE 
Change-Id: I8bac21044a928351bf38da831b7239694756fb2d
Auto-generated-cl: translation import
 2014-11-06 09:37:03 -08: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
a9086ee973 Show accurate connection status for ephemeral networks. 
automerge: b46a919

* commit 'b46a9194fe88a26e80d415919d191703c340925e':
  Show accurate connection status for ephemeral networks.
 2014-11-06 02:18:57 +00:00