PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,471 Commits 1 Branch 0 Tags
0d09c6c190436ffc28dd9c04af1a1e7aa203463c
Commit Graph

15471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Fabrice Di Meglio
26d8c0e99e Merge "Fix bug #16951566 Switchbar color needs to change to ff37474f" into lmp-dev 2014-08-11 18:20:32 +00:00
Fabrice Di Meglio
8da603f230 Fix bug #16951566 Switchbar color needs to change to ff37474f 
- change the SwitchBar color as requested by UX

Change-Id: I3ca81e8ac0276fa9aab205f0045cd8b14855ddf7
 2014-08-11 15:31:33 -07:00
Paul Lawrence
ccf49c0206 Merge "Fix UI to mocks" into lmp-dev 2014-08-11 18:20:32 +00:00
Paul Lawrence
4fd2e5f398 Fix UI to mocks 
Bug: 16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
 2014-08-11 15:00:00 -07:00
Jim Miller
898671f141 Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev 2014-08-11 18:14:57 +00:00
Jim Miller
4a9065e654 Update SecuritySettings to use SwitchPreference 
Fixes bug 16900059

Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
 2014-08-11 16:35:41 -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
PauloftheWest
cccc5defd6 Merge "Added WiFi Assistant settings." into lmp-dev 2014-08-11 17:55:01 +00:00
PauloftheWest
d60f85daad Added WiFi Assistant settings. 
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.

Bug: 15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
 2014-08-12 11:27:38 -07:00
PauloftheWest
0cfb3c079f Merge "Revised Bluetooth discoverability string." into lmp-dev 2014-08-11 17:55:01 +00:00
PauloftheWest
ad11a0f989 Revised Bluetooth discoverability string. 
Bug: 16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
 2014-08-12 09:09:05 -07:00
Jeff Davidson
581af8cfee Merge "Clean up Wi-Fi Assistant card." into lmp-dev 2014-08-11 17:55:01 +00:00
Jeff Davidson
2e7162618d Clean up Wi-Fi Assistant card. 
Use a ListView header instead of a Preference to display the card at
the top of the list.

Also clean some dead code.

Bug: 16378017
Change-Id: I5a7f1d197cde071c45395b6d7f6016aa7201187a
 2014-08-11 14:07:55 -07: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
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
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
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
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
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
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
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
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
Alexandra Gherghina
83adb564de Show managed profile under accounts rather than users 
Also fixes overflow menu to update on remove/add managed profile.

Bug: 16234745
Bug: 16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
 2014-08-11 10:02:13 +01:00
Fabrice Di Meglio
4fbe967e0f Merge "Fix bug #16578018 Wi-Fi network list items should be centered with icons" into lmp-dev 2014-08-08 20:31:22 +00:00
Fabrice Di Meglio
cba834dedf Fix bug #16578018 Wi-Fi network list items should be centered with icons 
- force correct refresh of the Preference summary
- put some non used code into comment ...

Change-Id: I17fc6fe2cf0717bae613d78cfac2c88d3e160ef4
 2014-08-08 13:55:58 -07:00
Fabrice Di Meglio
7aa645e498 am 07fd3469: Merge "Fix Wi-Fi Assistant padding" into lmp-dev 
* commit '07fd346996c61c47e1dc13648cbbde3090a4b248':
  Fix Wi-Fi Assistant padding
 2014-08-08 20:02:19 +00:00
Fabrice Di Meglio
331c2bf5e6 am 09076e5f: Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 
* commit '09076e5f3c90dbc1a3bdf6f000e0c99dd2bb45b4':
  Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
 2014-08-08 19:39:57 +00:00
Alexandra Gherghina
59f01b9b58 Merge "Fix updating view flow of Account Sync Settings" into lmp-dev 2014-08-08 18:15:47 +00:00
Adam Lesinski
ff72b3ee55 Merge "Update to use new UsageStats API" into lmp-dev 2014-08-08 18:15:47 +00:00
Jeff Sharkey
c44e33e1a0 am dc16286f: Merge "Avoid NPE when template rapidly switched." into lmp-dev 
* commit 'dc16286ff32dfc4d087938461d0beca29b6167a3':
  Avoid NPE when template rapidly switched.
 2014-08-08 17:37:16 +00:00
Fabrice Di Meglio
09076e5f3c Merge "Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev 2014-08-08 17:26:08 +00:00
Fabrice Di Meglio
22a2a49b44 Fix bug #16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots 
- add the proper SearchIndexProvider to SimSettings
- allow indexing only an only if showSimCardTile() is true
- add Utils.showSimCardTile()

Change-Id: I5df2284d32f91fa454e1edebf1139d00593138a0
 2014-08-08 12:33:21 -07:00
PauloftheWest
fc5a4085e1 am 14f60296: Merge "Fixed Bluetooth renaming bug." into lmp-dev 
* commit '14f60296574316f94ca03fb82fc3675db373734e':
  Fixed Bluetooth renaming bug.
 2014-08-08 17:24:12 +00:00
Alexandra Gherghina
eecdb636b0 am e54014c4: Merge "Open the same tab when switching profiles in apps settings" into lmp-dev 
* commit 'e54014c4bbabfa3307e51253308263da0844537b':
  Open the same tab when switching profiles in apps settings
 2014-08-08 17:24:11 +00:00