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

15347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
32f48265c2 am 8190ee16: am 7d558271: am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev 
* commit '8190ee16c1c7d7150d3d6b29fe3974c73a62327d':
  Remove non-functional hardware keyboard options.
 2014-08-11 21:02:59 +00:00
Michael Wright
985758bf60 am f52904e5: am 84086bef: am ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev 
* commit 'f52904e5be418afd7a66b62498fb304436d79d42':
  Show physical keyboard settings even when IME is enabled.
 2014-08-11 21:02:58 +00:00
Michael Wright
8190ee16c1 am 7d558271: am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev 
* commit '7d55827198197f1cfb3d3c77e484ec95b35e0a57':
  Remove non-functional hardware keyboard options.
 2014-08-11 20:58:27 +00:00
Michael Wright
f52904e5be am 84086bef: am ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev 
* commit '84086bef852e6c4009dbe71c10f38fa2d7c96262':
  Show physical keyboard settings even when IME is enabled.
 2014-08-11 20:58:24 +00:00
Michael Wright
7d55827198 am bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev 
* commit 'bb76ee92bc69a6ccae7c9085e23a45504c2c1217':
  Remove non-functional hardware keyboard options.
 2014-08-11 20:53:16 +00:00
Michael Wright
84086bef85 am ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev 
* commit 'ace6dc4f28bf3188c85d48ddebcd7c53d6d14079':
  Show physical keyboard settings even when IME is enabled.
 2014-08-11 20:53:15 +00:00
PauloftheWest
348ab5d8c6 am 7b8a6a27: am c7396657: am 242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev 
* commit '7b8a6a27f05e874f65bce0764a1f31ef7f752ea6':
  Removed the white icon from Bluetooth rename dialog.
 2014-08-11 20:32:22 +00:00
PauloftheWest
7b8a6a27f0 am c7396657: am 242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev 
* commit 'c7396657e7765da5a448e32e0b9558d8078cad1a':
  Removed the white icon from Bluetooth rename dialog.
 2014-08-11 20:25:50 +00:00
PauloftheWest
c7396657e7 am 242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev 
* commit '242b1e51d45134f150487f60c3c00027737da05a':
  Removed the white icon from Bluetooth rename dialog.
 2014-08-11 20:20:04 +00:00
Michael Wright
ace6dc4f28 Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev 2014-08-11 18:26:04 +00:00
Michael Wright
02d501433d Show physical keyboard settings even when IME is enabled. 
The WindowManager lies about the configuration in order to get the
IME to show but the Settings page should still show the physical
keyboard options if one is connected though, so remove the
configuration check and just always check to see if there's a full
keyboard connected.

Bug: 14066881
Change-Id: I085fe4160f3524f3c95737a6809ee03fec5230b4
 2014-08-11 13:02:01 -07:00
Michael Wright
bb76ee92bc Merge "Remove non-functional hardware keyboard options." into lmp-dev 2014-08-11 18:20:32 +00:00
Michael Wright
572f90bdf8 Remove non-functional hardware keyboard options. 
Bug: 16027438
Bug: 16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
 2014-08-11 13:02:09 -07:00
PauloftheWest
242b1e51d4 Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev 2014-08-11 18:05:12 +00:00
PauloftheWest
cefd0c93ce Removed the white icon from Bluetooth rename dialog. 
Bug: 15538917
Change-Id: I4e3bca9e8ff6c348af22cdfb17ee3b047ae12d2c
 2014-08-11 11:49:31 -07:00
Jason Monk
801b2b1cd4 am b86fef6e: am c2a716aa: am 918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev 
* commit 'b86fef6e22187c2c85bfa04aafe62e4ec033f16d':
  Don't allow creating guest when can't create user
 2014-08-11 17:24:01 +00:00
Jason Monk
b86fef6e22 am c2a716aa: am 918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev 
* commit 'c2a716aaca10ec3469573e13616dcccf70c1e088':
  Don't allow creating guest when can't create user
 2014-08-11 17:19:49 +00:00
Dianne Hackborn
d78d71edf6 am 90a5bffe: am 4154354f: am f09fd458: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev 
* commit '90a5bffe672c0affba919652cb8ca8521f4d0a36':
  Fix issues in Settings: 16660423, 13172381, 16868094
 2014-08-11 17:19:04 +00:00
Jason Monk
c2a716aaca am 918c23bd: Merge "Don\'t allow creating guest when can\'t create user" into lmp-dev 
* commit '918c23bd5ff6b8903634320723e57d8c0d79471f':
  Don't allow creating guest when can't create user
 2014-08-11 17:16:27 +00:00
Dianne Hackborn
90a5bffe67 am 4154354f: am f09fd458: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev 
* commit '4154354f6280c31f3b39e345c4cd8d0105f46d4e':
  Fix issues in Settings: 16660423, 13172381, 16868094
 2014-08-11 17:16:01 +00:00
Dianne Hackborn
4154354f62 am f09fd458: Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev 
* commit 'f09fd458c4429f88f2d8678ffa147c0ca4cee064':
  Fix issues in Settings: 16660423, 13172381, 16868094
 2014-08-11 17:11:42 +00:00
Jason Monk
918c23bd5f Merge "Don't allow creating guest when can't create user" into lmp-dev 2014-08-11 17:09:03 +00:00
Dianne Hackborn
f09fd458c4 Merge "Fix issues in Settings: 16660423, 13172381, 16868094" into lmp-dev 2014-08-11 16:46:29 +00:00
Jason Monk
7c2739888a Don't allow creating guest when can't create user 
When user restriction is on to disable adding user also stop the
user from creating guests.

Bug: 16782635
Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
 2014-08-11 10:22:43 -04:00
Zoltan Szatmary-Ban
15c212b855 am 986df0c9: am 3acb8874: am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 
* commit '986df0c92ae5900f196a114396802a7d1edaeed7':
  Increase CHAR_LIMIT on Device Admins Settings message
 2014-08-11 12:19:42 +00:00
Zoltan Szatmary-Ban
986df0c92a am 3acb8874: am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 
* commit '3acb88746af9fcf38d38d159b4d9556eee9b03bc':
  Increase CHAR_LIMIT on Device Admins Settings message
 2014-08-11 12:16:53 +00:00
Zoltan Szatmary-Ban
3acb88746a am d58f0bd6: Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 
* commit 'd58f0bd64f1554a4c15b812bcd90fc52f00860b6':
  Increase CHAR_LIMIT on Device Admins Settings message
 2014-08-11 12:13:51 +00:00
Alexandra Gherghina
80f5a84bf0 am d857636e: am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'd857636eec3bbb862a9259130fca569c95de3b72':
  Show managed profile under accounts rather than users
 2014-08-11 09:35:53 +00:00
Alexandra Gherghina
d857636eec am bad9e585: am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'bad9e585dde30e6dcd1066bd5045516d79491b43':
  Show managed profile under accounts rather than users
 2014-08-11 09:31:42 +00:00
Alexandra Gherghina
bad9e585dd am ad54ba70: Merge "Show managed profile under accounts rather than users" into lmp-dev 
* commit 'ad54ba7030be6654bd76b3ee1a001d388130bcac':
  Show managed profile under accounts rather than users
 2014-08-11 09:29:20 +00:00
Alexandra Gherghina
c465b19883 am 27ece31c: am 28034bad: am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '27ece31c59ae075f8d21efce7030066244c04d9e':
  Fix updating view flow of Account Sync Settings
 2014-08-11 09:05:39 +00:00
Alexandra Gherghina
27ece31c59 am 28034bad: am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '28034badf70b5d8b46aeb19dbbb45465db7172b0':
  Fix updating view flow of Account Sync Settings
 2014-08-11 09:02:08 +00:00
Alexandra Gherghina
28034badf7 am 59f01b9b: Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 
* commit '59f01b9b585c374fadb935fb115b4ad34b100eb4':
  Fix updating view flow of Account Sync Settings
 2014-08-11 08:58:48 +00:00
Dianne Hackborn
1cf2077c37 Fix issues in Settings: 16660423, 13172381, 16868094 
Issue #16660423: Stability: ArrayIndexOutOfBoundsException in settings:
at com.android.settings.fuelgauge.BatteryHistoryChart$ChartData.draw(
BatteryHistoryChart.java:109)

Issue #13172381: No content description in Battery charging section

Issue #16868094: Settings crash on switching to landscape mode with
"Google Text-to-speech" settings icon selected

Change-Id: I94d0e83f72d571eb90aad6742acabce56c0298ec
 2014-08-10 16:32:08 -07:00
Barnaby James
a254fd6663 am 536301a6: am 71d48c7d: am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '536301a69e87af2d970376757172a92a495dc7d2':
  Add voice-only settings activities for airplane mode.
 2014-08-09 20:05:20 +00:00
Barnaby James
536301a69e am 71d48c7d: am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '71d48c7deee389697247a96895afa2a833b3979e':
  Add voice-only settings activities for airplane mode.
 2014-08-09 20:02:13 +00:00
Barnaby James
71d48c7dee am 092c62f1: Add voice-only settings activities for airplane mode. 
* commit '092c62f1f3811f205c764fcb5b8347ec8fed67e6':
  Add voice-only settings activities for airplane mode.
 2014-08-09 19:57:54 +00:00
Barnaby James
092c62f1f3 Add voice-only settings activities for airplane mode. 
This activity can only be triggered through the Voice Interaction API - e.g. from calling VoiceInterationSession.startVoiceActivity()

Change-Id: I39ac409824693bc82e53d707a1ece2b23a89f3a3
 2014-08-08 21:01:01 -07:00
Paul Lawrence
9ab22ac93d am b1f3a008: am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'b1f3a00884dd1e68e460313b1dbb33fbe3c56ba2':
  Strings for next change
 2014-08-08 23:11:24 +00:00
Paul Lawrence
b1f3a00884 am c4427491: am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'c44274917f0f320d9997e03aae0f1f6249572c2e':
  Strings for next change
 2014-08-08 23:05:00 +00:00
Paul Lawrence
c44274917f am f8811a59: Merge "Strings for next change" into lmp-dev 
* commit 'f8811a59ffd4fa39997154681d753d3370697b83':
  Strings for next change
 2014-08-08 22:59:36 +00:00
Adam Lesinski
9e4115c101 am d80b52d0: am b6bf2d58: am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'd80b52d0acf9a3ac714a214a840b2ba4c5dbc9fa':
  Update to use new UsageStats API
 2014-08-08 22:49:38 +00:00
Adam Lesinski
d80b52d0ac am b6bf2d58: am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'b6bf2d584756468ffa666ee618702cb60c1263fe':
  Update to use new UsageStats API
 2014-08-08 22:44:23 +00:00
Adam Lesinski
b6bf2d5847 am ff72b3ee: Merge "Update to use new UsageStats API" into lmp-dev 
* commit 'ff72b3ee556e3524e0c5e3218e781a914aa1fa4e':
  Update to use new UsageStats API
 2014-08-08 22:39:52 +00:00
Fabrice Di Meglio
4599b2dec5 am 92987f3a: am 212f1327: am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '92987f3a98c2b66eddba66f41d9aea71b7f70cb3':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:10:29 +00:00
Fabrice Di Meglio
92987f3a98 am 212f1327: am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '212f13274bcce65a22f4c31b04fd5d72b56b3601':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:04:58 +00:00
Fabrice Di Meglio
212f13274b am 4fbe967e: Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 
* commit '4fbe967e0f19e04e5ed40cc42c55ec0b5dfc5643':
  Fix bug #16578018 Wi-Fi network list items should be centered with icons
 2014-08-08 21:02:32 +00:00
Zoltan Szatmary-Ban
d58f0bd64f Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev 2014-08-08 20:34:05 +00:00
Zoltan Szatmary-Ban
a1373770c1 Increase CHAR_LIMIT on Device Admins Settings message 
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.

Bug:16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
 2014-08-11 11:50:39 +01:00
Alexandra Gherghina
ad54ba7030 Merge "Show managed profile under accounts rather than users" into lmp-dev 2014-08-08 20:34:05 +00:00