Commit Graph

15042 Commits

Author SHA1 Message Date
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
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
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
John Spurlock
dc79528bf6 Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 2014-08-16 04:32:18 +00:00
John Spurlock
8b3766de66 Settings: Remove needless dialogTitle attribute.
DropDownPreference has no dialog, and therefore no title.

Remove to avoid confusion for future copy-pasters.

Bug:16241745
Change-Id: I1130ed5d90b9b769294b64f02ddbf8f00fabe6b0
2014-08-20 15:37:07 -04:00
Amith Yamasani
d05dd864d6 Merge "Update strings for guest removal affordance and dialog" into lmp-dev 2014-08-16 04:32:18 +00:00
Amith Yamasani
94c0181c8f Update strings for guest removal affordance and dialog
Exit guest -> Remove guest
etc.

Bug: 16495144
Change-Id: Ieb44e886ea537682a6922046c0f63cef1456c6d8
2014-08-18 16:42:43 -07:00
PauloftheWest
31584ec3e9 Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev 2014-08-16 04:32:18 +00:00
PauloftheWest
3280dc144f Fixed a crash when rotating a saved networks dialog.
Bug: 16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
2014-08-18 09:28:21 -07:00
Alexandra Gherghina
0cad779d3e Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev 2014-08-16 04:29:45 +00:00
Alexandra Gherghina
f2e39f2ee4 Switch to listening for USER_INITIALIZE broadcast in the Settings app.
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.

Bug: 17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
2014-08-18 17:42:26 +01:00
Paul Lawrence
d5a497b837 Merge "Change decryption strings" into lmp-dev 2014-08-16 04:03:42 +00:00
Paul Lawrence
c8452ae031 Change decryption strings
Bug: 17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
2014-08-19 08:56:49 -07:00
PauloftheWest
6a2b1a44d2 Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev 2014-08-16 04:03:42 +00:00
PauloftheWest
c2cf256853 Fixed a bug were AdvanceWifiSettings would crash on resume.
Bug: 17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
2014-08-18 11:49:09 -07: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
Paul Lawrence
b7b686cadf Merge "Fix encryption strings" into lmp-dev 2014-08-16 03:51:48 +00:00
Julia Reynolds
7138ed7404 Merge "Supress menu if screen ought to be hidden." into lmp-dev 2014-08-16 03:51:48 +00:00
Julia Reynolds
6cc7cccf11 Supress menu if screen ought to be hidden.
Bug: 14081992
Change-Id: I56183413a001b3e6dd74de249e9afc131e6671e4
2014-08-18 16:04:48 -04: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
Jeff Davidson
90b3b211ef Less intrusive VPN dialog.
Add new AppOps to Settings and remove references to obsolete
ManageDialog. VPN UX now lives in Quick Settings.

Bug: 12878887
Bug: 16578022
Change-Id: I102a14c05db26ee3aef030cda971e5165f078a91
2014-08-15 15:00:50 -07: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
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
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
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
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
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
Baligh Uddin
86370f5dfd Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-15 04:38:54 +00:00