PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,849 Commits 1 Branch 0 Tags
dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c
Commit Graph

17849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
fbacdbdc5f am 330fc418: am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev 
* commit '330fc41823e3982d183b6c96bf794f63476bb856':
  Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted
 2014-11-07 19:24:10 +00:00
Fabrice Di Meglio
e8b40c950b am d762aaab: am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev 
* commit 'd762aaabd28242a50ec6493151b8f2dbb74e0edb':
  Fix bug #17936169 subsettings activity crashes on emulator for android-21
 2014-11-07 19:24:09 +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
0ae5f6037b am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev 
* commit 'dac36fafbe5757bdfc44d50e93c4e2771fbc71e0':
  Screen pinning: fix strings and add scrollview
 2014-11-07 17:07:02 +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
a42a440322 am 00585e42: (-s ours) am 5d6b47c1: (-s ours) am 960c98f9: (-s ours) Import translations. DO NOT MERGE 
* commit '00585e420a44aa37c92d16ae93ecc34bbb5fe0f5':
  Import translations. DO NOT MERGE
 2014-11-07 15:19:27 +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
040cb642e3 am 886ac25c: (-s ours) am 449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '886ac25c6965998f46c6027eb42122a62523b151':
  Import translations. DO NOT MERGE
 2014-11-07 15:11:28 +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
ccd9fb5bde am 5fbfdc83: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '5fbfdc83e4800919363fa7387b1fb80672ff4b11':
  Import translations. DO NOT MERGE
 2014-11-07 15:06:54 +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
bea0f7f9a0 am a4a7b739: am c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev 
* commit 'a4a7b739ac22413f886180440d6ccfba1e373c31':
  Disable app notifications checkbox for uninstalled apps
 2014-11-07 10:44:53 +00:00
Alexandra Gherghina
6f8019d889 am fcb880c6: am ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev 
* commit 'fcb880c6d1cbe23bcfcbd92f1b6cdc3c88892e39':
  Update text for apps installed for other users
 2014-11-07 10:44:51 +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
981ab4b2f1 am a581a16d: am fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev 
* commit 'a581a16dcd7bd02260ce4e3c1e8635478a817bc1':
  Update synonyms and fix some issues related to them
 2014-11-07 01:55:39 +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
0844554f82 am 83b4fac5: am 41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev 
* commit '83b4fac50a198187f410e2b4e8694c22db173d45':
  Add a new flow for decryption checking.
 2014-11-07 00:40:47 +00: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
0fc9271b21 am c4a68608: am 99f191f5: Remove the Wi-Fi Assistant card. 
* commit 'c4a686086cf85808fea1f10a6072d197cffb686b':
  Remove the Wi-Fi Assistant card.
 2014-11-07 00:24:21 +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
65ea49a2fb am 74924424: Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev automerge: ac61828 
* commit '7492442451b960b1b8667d3424d81b8590c842c3':
  Fix NPE when parceling SubInfoRecord
 2014-11-06 19:26:57 +00: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
7b17e24d36 am a9086ee9: Show accurate connection status for ephemeral networks. automerge: b46a919 
* commit 'a9086ee973d61ca009f11372b8182572664b15cd':
  Show accurate connection status for ephemeral networks.
 2014-11-06 02:22:51 +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