Fabrice Di Meglio
4325f80808
Update NFC to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
2014-08-15 14:28:04 -07:00
Glenn Kasten
bf84be427d
am d0ec634c
: am e89abcc8
: am 2be2a8a4
: Merge "Increase character limit for translation" into lmp-dev
...
* commit 'd0ec634c74fad66e6d8d5add4d5124167320a367':
Increase character limit for translation
2014-08-15 21:26:59 +00:00
arete
e0950be1b7
am e20063fc
: am 4595b470
: am 300e920f
: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit 'e20063fc334d159446aa4f60b9884fdf82269a2c':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 21:26:58 +00:00
Fabrice Di Meglio
60e678e5d2
am c33bac82
: am 880de9f2
: am e3bced2c
: Update Airplane mode to use a SwitchPreference
...
* commit 'c33bac825497da0746f3098fb8c02d4e9f439c3a':
Update Airplane mode to use a SwitchPreference
2014-08-15 21:26:57 +00:00
Maurice Lam
5df0204cf0
am e72e44d0
: am 03ec9ff4
: am cd93d141
: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit 'e72e44d09982ae3c7fcc96ce0cd24e42bbd409d6':
[WifiSetup] Use framework AutoMirrored
2014-08-15 21:26:56 +00:00
Julia Reynolds
2ea6bb355f
am 9d20b0c0
: am eb0d3b7c
: am fad2b09d
: Merge "Disable disable button according to user restrictions." into lmp-dev
...
* commit '9d20b0c089e7b65bc56f90b23fec909b98dbd4f7':
Disable disable button according to user restrictions.
2014-08-15 21:26:55 +00:00
Jim Miller
23c76e38ef
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
2014-08-15 21:23:40 +00:00
Jim Miller
6a0c89743c
Remove temporary workaround for GMS TrustAgent while API changed.
...
Fixes bug 16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
2014-08-15 14:30:01 -07:00
Baligh Uddin
b3b647054e
Import translations. DO NOT MERGE
...
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
2014-08-15 14:21:56 -07:00
Glenn Kasten
d0ec634c74
am e89abcc8
: am 2be2a8a4
: Merge "Increase character limit for translation" into lmp-dev
...
* commit 'e89abcc8e88bec69e37f11fa051b9b299246a0f3':
Increase character limit for translation
2014-08-15 21:17:31 +00:00
arete
e20063fc33
am 4595b470
: am 300e920f
: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit '4595b470d37a3152d6f76488414e58da3ad516a4':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 21:17:29 +00:00
Fabrice Di Meglio
c33bac8254
am 880de9f2
: am e3bced2c
: Update Airplane mode to use a SwitchPreference
...
* commit '880de9f2edd81e1ad09158f07893374053210778':
Update Airplane mode to use a SwitchPreference
2014-08-15 21:17:08 +00:00
Maurice Lam
e72e44d099
am 03ec9ff4
: am cd93d141
: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit '03ec9ff4395ea2275e54e40f6ecdaa2721cf26e9':
[WifiSetup] Use framework AutoMirrored
2014-08-15 21:17:07 +00:00
Julia Reynolds
9d20b0c089
am eb0d3b7c
: am fad2b09d
: Merge "Disable disable button according to user restrictions." into lmp-dev
...
* commit 'eb0d3b7cd02ac8d89b52d26f495ade11bc85c364':
Disable disable button according to user restrictions.
2014-08-15 21:16:59 +00:00
Fabrice Di Meglio
b67a3c59ee
am 1c6d5406
: am 1b1f3d59
: am 0ff107e3
: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
...
* commit '1c6d54064643e5648b58892ef0d92ce9be9fdb53':
Fix bug #16703191 APN settings shows back button even when you intent into it
2014-08-15 21:11:08 +00:00
Glenn Kasten
e89abcc8e8
am 2be2a8a4
: Merge "Increase character limit for translation" into lmp-dev
...
* commit '2be2a8a47f5ef585301479268752aa3d7d3a9261':
Increase character limit for translation
2014-08-15 21:07:10 +00:00
Fabrice Di Meglio
1c6d540646
am 1b1f3d59
: am 0ff107e3
: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
...
* commit '1b1f3d5949a68967e5cc405d5aed1c357ecb0aa0':
Fix bug #16703191 APN settings shows back button even when you intent into it
2014-08-15 20:59:21 +00:00
arete
4595b470d3
am 300e920f
: Keep SwitchPreference status until user makes choice in confirmation dialog.
...
* commit '300e920f66c03b390ce738ccf4d4646ffa039d40':
Keep SwitchPreference status until user makes choice in confirmation dialog.
2014-08-15 20:56:44 +00:00
arete
300e920f66
Keep SwitchPreference status until user makes choice in confirmation dialog.
...
Bug: 17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
2014-08-15 20:49:44 +00:00
Fabrice Di Meglio
880de9f2ed
am e3bced2c
: Update Airplane mode to use a SwitchPreference
...
* commit 'e3bced2cdaf70812f658c45c170e4943ed79dfaf':
Update Airplane mode to use a SwitchPreference
2014-08-15 20:45:12 +00:00
Maurice Lam
03ec9ff439
am cd93d141
: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
...
* commit 'cd93d141302ee374285d5a8dcd97bc7ab61298cc':
[WifiSetup] Use framework AutoMirrored
2014-08-15 20:36:35 +00:00
Fabrice Di Meglio
e3bced2cda
Update Airplane mode to use a SwitchPreference
...
- do the switch
See bug: #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
2014-08-15 20:36:29 +00:00
Julia Reynolds
eb0d3b7cd0
am fad2b09d
: Merge "Disable disable button according to user restrictions." into lmp-dev
...
* commit 'fad2b09db8cf65478db35f9a8265c948ccffeabc':
Disable disable button according to user restrictions.
2014-08-15 20:23:20 +00:00
Julia Reynolds
fad2b09db8
Merge "Disable disable button according to user restrictions." into lmp-dev
2014-08-15 19:14:43 +00:00
Glenn Kasten
2be2a8a47f
Merge "Increase character limit for translation" into lmp-dev
2014-08-15 18:56:10 +00:00
Glenn Kasten
042a9a0bab
Increase character limit for translation
...
Bug: 17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
2014-08-15 13:24:45 -07:00
Maurice Lam
cd93d14130
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
2014-08-15 18:50:14 +00:00
Maurice Lam
8d449a0e36
[WifiSetup] Use framework AutoMirrored
...
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug: 17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
2014-08-15 12:54:33 -07:00
Fabrice Di Meglio
1b1f3d5949
am 0ff107e3
: Merge "Fix bug #16703191 APN settings shows back button even when you intent into it" into lmp-dev
...
* commit '0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
Fix bug #16703191 APN settings shows back button even when you intent into it
2014-08-15 18:46:56 +00:00
John Spurlock
14f025bc31
am 95ab4a53
: am 9c979df2
: am a7f8addd
: Settings: Update to follow NotificationManager aidl change.
...
* commit '95ab4a537f2537e0ded2329a6bb5cfed82062595':
Settings: Update to follow NotificationManager aidl change.
2014-08-15 15:28:10 +00:00
John Spurlock
95ab4a537f
am 9c979df2
: am a7f8addd
: Settings: Update to follow NotificationManager aidl change.
...
* commit '9c979df2d6a768e909b546dc198f005c17ebeeab':
Settings: Update to follow NotificationManager aidl change.
2014-08-15 15:21:49 +00:00
John Spurlock
9c979df2d6
am a7f8addd
: Settings: Update to follow NotificationManager aidl change.
...
* commit 'a7f8addd0982f599105aeb9611477b149860db83':
Settings: Update to follow NotificationManager aidl change.
2014-08-15 15:16:15 +00:00
John Spurlock
a7f8addd09
Settings: Update to follow NotificationManager aidl change.
...
Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
2014-08-15 15:06:43 +00:00
Baligh Uddin
a065c3e8f1
am 5173ab28
: (-s ours) am e403e32a
: (-s ours) am 86370f5d
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '5173ab28026d59eb672cf6a416fde4ed20704d02':
Import translations. DO NOT MERGE
2014-08-15 13:37:50 +00:00
Maurice Lam
2a118af91b
am a604bf23
: am 2d57c470
: am 3d8dd19c
: Merge "[WifiSetup] Update illustrations" into lmp-dev
...
* commit 'a604bf238597114b28d937f7db4ab34d71c6fd38':
[WifiSetup] Update illustrations
2014-08-15 13:37:48 +00:00
Jim Miller
6b42451e41
am 23174fc8
: am adf93411
: am bbce34d9
: Merge "API review - move confirm credential constants from Intent" into lmp-dev
...
* commit '23174fc812bed9684cda089ff2fe53aa632589ad':
API review - move confirm credential constants from Intent
2014-08-15 13:37:47 +00:00
Selim Gurun
d998626853
am ce0f0078
: am 63b671c8
: am ce8d3910
: Remove logic to read the key from GServices
...
* commit 'ce0f0078641331b6ba8f4c900f95bfbb319a7054':
Remove logic to read the key from GServices
2014-08-15 13:37:46 +00:00
Baligh Uddin
5173ab2802
am e403e32a
: (-s ours) am 86370f5d
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'e403e32afbfb2db4fcbb32819d7323a8374ed5f8':
Import translations. DO NOT MERGE
2014-08-15 11:50:34 +00:00
Maurice Lam
a604bf2385
am 2d57c470
: am 3d8dd19c
: Merge "[WifiSetup] Update illustrations" into lmp-dev
...
* commit '2d57c4705d73f37e0c7c1b96cc9e1288e4c17306':
[WifiSetup] Update illustrations
2014-08-15 11:50:00 +00:00
Jim Miller
23174fc812
am adf93411
: am bbce34d9
: Merge "API review - move confirm credential constants from Intent" into lmp-dev
...
* commit 'adf9341125fac14aef7beb272f6371a6aafb4aa3':
API review - move confirm credential constants from Intent
2014-08-15 11:49:21 +00:00
Selim Gurun
ce0f007864
am 63b671c8
: am ce8d3910
: Remove logic to read the key from GServices
...
* commit '63b671c84b48703bbc2d554fa378b8c1e853e19c':
Remove logic to read the key from GServices
2014-08-15 11:48:32 +00:00
arete
0034c9047b
am 4db6a46e
: am f1fd6937
: am 17224826
: Cannot cancel in the "Warn app installation" dialog in security settings.
...
* commit '4db6a46ef8f7d2d28a798e8ba12de0a54d6fc2b1':
Cannot cancel in the "Warn app installation" dialog in security settings.
2014-08-15 11:42:43 +00:00
Adam Powell
570334eda9
am 872e9575
: am 7660042f
: am aa772c95
: Merge "Use material alert dialog item view layout" into lmp-dev
...
* commit '872e9575160c02e80e809a2c3a1b931bd2ede445':
Use material alert dialog item view layout
2014-08-15 11:42:42 +00:00
arete
8208b42db7
am b2bc75dc
: am 943a1877
: am ce543836
: Change checkboxes to switches in "Settings->Backup&Reset"
...
* commit 'b2bc75dc50d9eb41e6f6a44c0292c6f7c8a7ed1a':
Change checkboxes to switches in "Settings->Backup&Reset"
2014-08-15 11:42:41 +00:00
Fabrice Di Meglio
7a81dab5b6
am 737fc5ec
: am 0147d813
: am d83b3c2a
: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered
...
* commit '737fc5ec9e7509a5336be601674a1c3590c86ca8':
Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
2014-08-15 11:42:40 +00:00
arete
4db6a46ef8
am f1fd6937
: am 17224826
: Cannot cancel in the "Warn app installation" dialog in security settings.
...
* commit 'f1fd693751d73b51e5cdf6a71dccca3884ee125f':
Cannot cancel in the "Warn app installation" dialog in security settings.
2014-08-15 11:36:57 +00:00
Adam Powell
872e957516
am 7660042f
: am aa772c95
: Merge "Use material alert dialog item view layout" into lmp-dev
...
* commit '7660042fa2f5423b9e5d156db0d063e9ffed0fe3':
Use material alert dialog item view layout
2014-08-15 11:35:36 +00:00
arete
b2bc75dc50
am 943a1877
: am ce543836
: Change checkboxes to switches in "Settings->Backup&Reset"
...
* commit '943a1877e6636d6986eadbf7d699356b085c469e':
Change checkboxes to switches in "Settings->Backup&Reset"
2014-08-15 11:35:30 +00:00
Fabrice Di Meglio
737fc5ec9e
am 0147d813
: am d83b3c2a
: Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@273c8fdb was not registered
...
* commit '0147d813edb6befc8a1728accc54a70ebcc6bc3d':
Fix bug #16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@273c8fdb was not registered
2014-08-15 11:33:21 +00:00
Baligh Uddin
e403e32afb
am 86370f5d
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '86370f5dfd3f78e80b9940c31d73975a46080964':
Import translations. DO NOT MERGE
2014-08-15 05:52:16 +00:00