Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,034 Commits 1 Branch 0 Tags
a5db8ba5afd669de607cc7db2578927476aed12a
Commit Graph

15034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
a5db8ba5af am 4e064343: Merge "Less intrusive VPN dialog." into lmp-dev 
* commit '4e064343b35cfa6a7615e453c1f6bcf96397e414':
  Less intrusive VPN dialog.
 2014-08-21 00:09:47 +00:00
PauloftheWest
8f60bf4cad am e847e7ef: Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev 
* commit 'e847e7ef56561bf7ac824d4e5aa742be08f92624':
  Added a default Bluetooth icon for Bluetooth Preferences.
 2014-08-20 22:10:17 +00:00
Jeff Davidson
4e064343b3 Merge "Less intrusive VPN dialog." into lmp-dev 2014-08-20 21:39:11 +00:00
PauloftheWest
e847e7ef56 Merge "Added a default Bluetooth icon for Bluetooth Preferences." into lmp-dev 2014-08-20 21:39:11 +00:00
PauloftheWest
5badff7622 Added a default Bluetooth icon for Bluetooth Preferences. 
Bug: 17139683
Change-Id: I7b68950685732a85319a0dca7bd77234d345dbb7
 2014-08-20 14:48:38 -07:00
PauloftheWest
98d0f8ca2d am d251fba2: Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 
* commit 'd251fba2fe308ea6aa18002c92506fca9d53848d':
  Fixed a Bluetooth Scanning issue.
 2014-08-20 21:17:34 +00:00
Amith Yamasani
6879169fe9 am 23d8742d: Merge "Update string for profile owner addition warning" into lmp-dev 
* commit '23d8742df6719f3f20545fc345b9f1cc74c6165a':
  Update string for profile owner addition warning
 2014-08-20 21:08:26 +00:00
PauloftheWest
0233d732eb am 2dc11d40: Merge "Fixed a Settings dialog crash." into lmp-dev 
* commit '2dc11d40c205432774d4e4bc7ce56407b99eaa3a':
  Fixed a Settings dialog crash.
 2014-08-20 20:12:08 +00:00
John Spurlock
1bc2ff2b30 am dc79528b: Merge "Settings: Remove needless dialogTitle attribute." into lmp-dev 
* commit 'dc79528bf660b9e431141e93a8c1c378af337b7a':
  Settings: Remove needless dialogTitle attribute.
 2014-08-20 19:53:04 +00:00
Amith Yamasani
23d8742df6 Merge "Update string for profile owner addition warning" into lmp-dev 2014-08-20 18:43:12 +00:00
Amith Yamasani
2e4489d6c3 Update string for profile owner addition warning 
Bug: 16207721
Change-Id: I561e0fc992f19339ab794dd7dffb9d650da141a0
 2014-08-20 13:43:13 -07:00
Jon Miranda
b96f55f060 am 735219be: Merge "Added a developer option to save attribute data." into lmp-dev 
* commit '735219be8f85bd1ad41ab91834e5a427bb2ae7fc':
  Added a developer option to save attribute data.
 2014-08-20 15:30:30 +00:00
Jeff Brown
2cd05f7123 am ff0e81eb: Declare CAST_SETTINGS activity. 
* commit 'ff0e81eb099dd7fe15c1d444e89a992b0f020a47':
  Declare CAST_SETTINGS activity.
 2014-08-20 03:19:32 +00:00
Jeff Brown
ff0e81eb09 Declare CAST_SETTINGS activity. 
Currently this is the same as the WIFI_DISPLAY_SETTINGS activity
although we may eventually split them apart.

Change-Id: I4c4482792abc3d3d22fb50ee9657b536374a618f
 2014-08-19 19:44:47 -07:00
Maurice Lam
8904061e66 am e62de59b: Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 
* commit 'e62de59b947144ded046778b4f4ea0cc4bba12df':
  [WifiSetup] Change illustration aspect ratio
 2014-08-20 02:22:21 +00:00
Jon Miranda
735219be8f Merge "Added a developer option to save attribute data." into lmp-dev 2014-08-20 01:43:56 +00:00
Maurice Lam
e62de59b94 Merge "[WifiSetup] Change illustration aspect ratio" into lmp-dev 2014-08-20 01:43:56 +00:00
Alan Viverette
86cd94a3ad am aaa066b6: Add "experimental" subtitle to color correction and inversion 
* commit 'aaa066b66d4c8acf8931e624cf81376ac35d358e':
  Add "experimental" subtitle to color correction and inversion
 2014-08-20 00:47:11 +00:00
Alan Viverette
aaa066b66d Add "experimental" subtitle to color correction and inversion 
BUG: 17112912
Change-Id: I84eaa94e755bfcfbdf014fae09d1b02ae5d2eb4a
 2014-08-19 17:37:16 -07:00
PauloftheWest
d251fba2fe Merge "Fixed a Bluetooth Scanning issue." into lmp-dev 2014-08-19 22:53:25 +00:00
Paul Lawrence
17f213d781 am b7b686ca: Merge "Fix encryption strings" into lmp-dev 
* commit 'b7b686cadf6a07c74672d4e1c3aab30e7d24a545':
  Fix encryption strings
 2014-08-19 20:59:13 +00:00
Paul Lawrence
71894714c9 am d5a497b8: Merge "Change decryption strings" into lmp-dev 
* commit 'd5a497b8375444858fb17008a450d3bc26269d1c':
  Change decryption strings
 2014-08-19 20:59:12 +00:00
Maurice Lam
c73e339b3b [WifiSetup] Change illustration aspect ratio 
Change the aspect ratio of the illustration to 20:9 to align with UX
mocks.

Bug: 17111669
Change-Id: I37b2ca7624b7baf156830db53d2cea97a78e2dab
 2014-08-19 13:20:27 -07:00
Lorenzo Colitti
d73fc0c8d0 am f1b786d8: Stop using LinkProperties for static configuration. 
* commit 'f1b786d8a8dc894904c5edc6e375da0e7ddb7ed4':
  Stop using LinkProperties for static configuration.
 2014-08-19 19:29:01 +00:00
Lorenzo Colitti
f1b786d8a8 Stop using LinkProperties for static configuration. 
Bug: 16114392
Bug: 16893413
Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
 2014-08-19 11:59:44 -07:00
Julia Reynolds
51e8febf8c am 7138ed74: Merge "Supress menu if screen ought to be hidden." into lmp-dev 
* commit '7138ed7404f22862ac7e2fdb29d71833dec9b1a3':
  Supress menu if screen ought to be hidden.
 2014-08-19 18:54:36 +00:00
Lifu Tang
6a86746f98 am 72bd4d25: Merge "Dim the preference icons when its disabled" into lmp-dev 
* commit '72bd4d252dc7a706b661f2970396dc0211d7b4de':
  Dim the preference icons when its disabled
 2014-08-19 17:32:13 +00:00
Lifu Tang
72bd4d252d Merge "Dim the preference icons when its disabled" into lmp-dev 2014-08-19 15:47:37 +00:00
Amith Yamasani
408943e9aa am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev 
* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
  Update strings for guest removal affordance and dialog
 2014-08-19 15:43:40 +00:00
Lifu Tang
47cdb72762 am 081a9162: Merge "Set switch to the correct enabling state" into lmp-dev 
* commit '081a9162c959f9cbd0cbd76674501cdb47d516a7':
  Set switch to the correct enabling state
 2014-08-19 04:29:17 +00:00
PauloftheWest
2dc11d40c2 Merge "Fixed a Settings dialog crash." into lmp-dev 2014-08-19 02:43:23 +00:00
PauloftheWest
b58e2005ab Fixed a Settings dialog crash. 
+ Fixed a bug where Settings would crash when trying to open paired bluetooth
device settings after device orientation change.

Bug: 16972564
Change-Id: I0e93551ae7d8f21711d85093756fc33b62f59b24
 2014-08-20 11:44:36 -07:00
Lifu Tang
081a9162c9 Merge "Set switch to the correct enabling state" into lmp-dev 2014-08-19 02:08:36 +00:00
Jon Miranda
0b65294a7a Added a developer option to save attribute data. 
After the checkbox for 'Enable view attribute inspection' is checked,
newly constructed Views will save their attribute data.

Change-Id: Ia6d150d0d9991a2341236a9d35055b811038c849
 2014-08-18 17:16:23 -07:00
Lifu Tang
b18e242366 Set switch to the correct enabling state 
- Fix b/16951708

Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
 2014-08-18 16:46:48 -07:00
PauloftheWest
637f1b4e45 Fixed a Bluetooth Scanning issue. 
+ When refreshing Bluetooth devices, sometimes it took awhile for some
devices to come back up.  This is a fix.

Bug: 17049458
Change-Id: Id6233b38585e003e0432707663af4d06b0ce98c2
 2014-08-18 15:00:19 -07:00
PauloftheWest
a4ab5a3a2b am 31584ec3: Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev 
* commit '31584ec3e99ded3dd96de06bcb1aa8e4dc408cce':
  Fixed a crash when rotating a saved networks dialog.
 2014-08-18 20:07:36 +00:00
PauloftheWest
480fcb2432 am 6a2b1a44: Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev 
* commit '6a2b1a44d2ed5bc0b5025ec62a51662850499d71':
  Fixed a bug were AdvanceWifiSettings would crash on resume.
 2014-08-18 20:07:35 +00:00
Lifu Tang
db0b7637fa Dim the preference icons when its disabled 
- Fix b/16956979

Change-Id: Idfa3fddf63746dea1db0c75dedab06b57aaf5de7
 2014-08-18 11:22:13 -07:00
Alexandra Gherghina
9db8f0aaf3 am 0cad779d: Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev 
* commit '0cad779d3e4d7ef361fa972e54879cd6791b467c':
  Switch to listening for USER_INITIALIZE broadcast in the Settings app.
 2014-08-18 16:56:17 +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
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