Alexandra Gherghina
13e00185b8
am 4b81ebf2
: am cd88c2f7
: Fix Account Settings crash
...
* commit '4b81ebf28557b8ed61ecdce96fcdef30c851ca4d':
Fix Account Settings crash
2014-08-18 16:44:28 +00:00
Alexandra Gherghina
4b81ebf285
am cd88c2f7
: Fix Account Settings crash
...
* commit 'cd88c2f7c30fe58e523e93469dd1fc7a121320f3':
Fix Account Settings crash
2014-08-18 16:39:54 +00:00
Alexandra Gherghina
cd88c2f7c3
Fix Account Settings crash
...
Bug: 17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
2014-08-18 14:34:13 +01:00
Baligh Uddin
1169cd85d2
am 1f4e0347
: (-s ours) am f14fa7ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit '1f4e0347b903823a19417e57d0e398e6e9c5dda6':
Import translations. DO NOT MERGE
2014-08-17 14:24:12 +00:00
Baligh Uddin
1f4e0347b9
am f14fa7ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'f14fa7ed4e9c61543a10f081027489558c4bc104':
Import translations. DO NOT MERGE
2014-08-17 14:08:30 +00:00
Adam Lesinski
6f0b3aa9d9
am 82951de9
: am a9dc57c1
: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit '82951de9fe1be4686e80ea61807140274deaff50':
Added Warning dialog when enabling usage access for app
2014-08-16 06:56:29 +00:00
Adam Lesinski
82951de9fe
am a9dc57c1
: Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
...
* commit 'a9dc57c145c91eaa5b43510575eae3e425adc461':
Added Warning dialog when enabling usage access for app
2014-08-16 06:49:40 +00:00
Baligh Uddin
464114588d
am a07fddf1
: (-s ours) am 88ee936a
: (-s ours) am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a07fddf1834f80872a83527dc5309d96fadb151d':
Import translations. DO NOT MERGE
2014-08-16 04:51:34 +00:00
Baligh Uddin
a07fddf183
am 88ee936a
: (-s ours) am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit '88ee936a94db3dcbecf7089183f740ab184c3907':
Import translations. DO NOT MERGE
2014-08-16 04:38:20 +00:00
Baligh Uddin
88ee936a94
am 2719eebf
: (-s ours) am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
2014-08-16 04:02:06 +00:00
Baligh Uddin
f14fa7ed4e
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-08-16 03:56:00 +00:00
Baligh Uddin
e63747ac7b
Import translations. DO NOT MERGE
...
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
2014-08-16 00:01:16 -07:00
Adam Lesinski
a9dc57c145
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
2014-08-16 03:52:42 +00:00
Adam Lesinski
e01dfd1a82
Added Warning dialog when enabling usage access for app
...
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
2014-08-15 21:14:28 -07:00
Christopher Tate
17488da041
am 98774d34
: am 568eeca5
: Disallow downgrade of bundled home apps
...
* commit '98774d3445e988840d4f68a91fbe7b9f48c3364c':
Disallow downgrade of bundled home apps
2014-08-16 00:49:10 +00:00
Christopher Tate
98774d3445
am 568eeca5
: Disallow downgrade of bundled home apps
...
* commit '568eeca569f97bfdd7cf6ae3b9cb5e7360eadc2c':
Disallow downgrade of bundled home apps
2014-08-16 00:43:04 +00:00
Christopher Tate
568eeca569
Disallow downgrade of bundled home apps
...
Bug 14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
2014-08-15 15:36:56 -07:00
Baligh Uddin
2719eebfc5
am b3b64705
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
2014-08-15 22:36:02 +00:00
Jim Miller
248e9eff3d
am 0b4e4fb1
: am 23c76e38
: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
...
* commit '0b4e4fb1102eb2ec421faa81afcb889eacb7f772':
Remove temporary workaround for GMS TrustAgent while API changed.
2014-08-15 22:04:00 +00:00
Jim Miller
0b4e4fb110
am 23c76e38
: Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
...
* commit '23c76e38ef2a62a996dbb304c558c80b3fee5f28':
Remove temporary workaround for GMS TrustAgent while API changed.
2014-08-15 21:45:31 +00:00
Fabrice Di Meglio
6dded22257
am e15902d6
: am 4325f808
: Update NFC to use a SwitchPreference
...
* commit 'e15902d61727e7924563ef76113fa49a65358ca8':
Update NFC to use a SwitchPreference
2014-08-15 21:42:46 +00:00
Fabrice Di Meglio
e15902d617
am 4325f808
: Update NFC to use a SwitchPreference
...
* commit '4325f8080888bd3b15246f5bbd9db878aced030c':
Update NFC to use a SwitchPreference
2014-08-15 21:37:24 +00:00
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
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
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
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
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