Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,719 Commits 1 Branch 0 Tags
12dfa2ed18b81f5e84e52ed28739ffe771871494
Commit Graph

1684 Commits

Author SHA1 Message Date
John Spurlock
c3fc2cbf38 am 2daea077: am 5c399368: am d39d7314: Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 
* commit '2daea077674caffd34d2022cd4cd37516d919f8c':
  Settings: Wire up Display > Lift to wake.
 2014-07-23 19:36:14 +00:00
John Spurlock
d39d731473 Merge "Settings: Wire up Display > Lift to wake." into lmp-dev 2014-07-23 18:31:55 +00:00
PauloftheWest
ff154d9902 am fc98ff5c: am b6e74d86: am 564282a3: Merge "Character limit updates" into lmp-dev 
* commit 'fc98ff5c9f160f6e2c754e548b37f73c0a272b4d':
  Character limit updates
 2014-07-23 17:30:59 +00:00
John Spurlock
333efe9097 Settings: Wire up Display > Lift to wake. 
Bug:15521792
Change-Id: I1a771641ad4fc52599149ac7db4a4fe55a6b9286
 2014-07-23 13:12:50 -04:00
John Spurlock
c0f5b2747a am 7d726417: am 58c891e8: am 54612391: Settings: Tweak zen alarm info string. 
* commit '7d726417af43b9c5bf5fc795a62f4a56d56220ff':
  Settings: Tweak zen alarm info string.
 2014-07-23 00:13:12 +00:00
Jeff Sharkey
661e854434 am d9e82576: am 13948a69: am e65bb492: Merge "Data Usage, materialized!" into lmp-dev 
* commit 'd9e825763e2f612f8f3515f958e1e2b4f84d31d5':
  Data Usage, materialized!
 2014-07-22 23:53:32 +00:00
John Spurlock
5461239187 Settings: Tweak zen alarm info string. 
Use standard styling and remove the bit about timers.

Bug:16487906
Change-Id: I28b8ac61981a2e9956d41768ee1185dc5ad950f3
 2014-07-22 19:51:40 -04:00
Fabrice Di Meglio
d3af3937d6 am 0c634a11: am 4ad8602a: am 3f3426e0: Merge "Add Home / Launcher apps indexing" into lmp-dev 
* commit '0c634a11a8a86fe0ccde7ddd839a3b00a34c12fd':
  Add Home / Launcher apps indexing
 2014-07-22 22:29:11 +00:00
Alexandra Gherghina
b381275989 am ec765ce1: am 534b84e9: am 6d839875: Revert "Revert "Move global sync settings to AccountSettings."" 
* commit 'ec765ce1127c4419fb71a0b1d90053e19d0b7f38':
  Revert "Revert "Move global sync settings to AccountSettings.""
 2014-07-22 21:55:33 +00:00
Jeff Sharkey
b654846300 Data Usage, materialized! 
Asset drop so Data Usage matches new Material spec.  Removes time
dimension sweeps, so we now summarize the entire visible axis.  Fix
time axis labels to not draw outside clip bounds.  Remove pie chart.

No more checkboxes in menus.  Telephony items like roaming are moved
back to cellular settings.  Start wiring up multi-SIM support.

Bug: 15760500, 16019700, 16289924, 16303795
Change-Id: Ie8f4821962319bb82ff4bc2f13f1f66ba1bdfe65
 2014-07-22 16:24:37 -07:00
Alexandra Gherghina
6d839875b7 Revert "Revert "Move global sync settings to AccountSettings."" 
This reverts commit 4869faf465.

Change-Id: I58df9b8161d711a9c0187af1f1a1dc279fb9d9ab
 2014-07-22 20:25:24 +00:00
John Spurlock
a2b423094e am 22cbe6b7: am badae7d8: am 59ea80b7: Merge "Settings: No really, keep the trailing space." into lmp-dev 
* commit '22cbe6b7354579add5e4e0ba6edd30cb5987d1fd':
  Settings: No really, keep the trailing space.
 2014-07-22 19:38:18 +00:00
Fabrice Di Meglio
3f3426e0d9 Merge "Add Home / Launcher apps indexing" into lmp-dev 2014-07-22 16:21:19 +00:00
Fabrice Di Meglio
d73045db7a Add Home / Launcher apps indexing 
- add a BaseSearchIndexProvider to HomeSettings
- use a BroadcastReceiver for tracking add or remove of
Home / Launcher apps
- add "launcher" synonym for "home" too

- also code cleaning for DynamicIndexableContentMonitor

See bug: #16484927 Add "launcher" as a synonym for "home" in settings search

Change-Id: I819f4e5f7bd5e9a7882609206b2733ea1912fc69
 2014-07-22 15:13:54 -07:00
PauloftheWest
fb3060378f Character limit updates 
Bug: 16322106
Bug: 16321901
Change-Id: I776a86658e03a6bed5554a1020cf2c272cbeb49b
 2014-07-23 10:11:43 -07:00
Alexandra Gherghina
b9a8e722fa am 7258665b: am c58595f2: am 4869faf4: Revert "Move global sync settings to AccountSettings." 
* commit '7258665bd0a6b5693cf0b38faaee16af9d20bae9':
  Revert "Move global sync settings to AccountSettings."
 2014-07-22 14:14:32 +00:00
Alexandra Gherghina
4443270ad4 am 6c92599f: am 761dad79: am 64fde6f4: Move global sync settings to AccountSettings. 
* commit '6c92599f369fb884a9affa7dcf9fcedcec111257':
  Move global sync settings to AccountSettings.
 2014-07-22 14:14:31 +00:00
Dianne Hackborn
84c94b10ae am a467c341: am fb420af3: am ff795ffb: Unify voice interactor and recognizer settings. 
* commit 'a467c3410a68930b04cfddd890f7ffd71e0dd6ed':
  Unify voice interactor and recognizer settings.
 2014-07-22 13:58:05 +00:00
Alexandra Gherghina
4869faf465 Revert "Move global sync settings to AccountSettings." 
This reverts commit 64fde6f4e9.

Change-Id: I61940b6e2936c7c7f048af222602226e5588c268
 2014-07-22 12:01:54 +00:00
Alexandra Gherghina
64fde6f4e9 Move global sync settings to AccountSettings. 
It also makes AccountSettings respond to the SYNC_SETTINGS intent, which
it is currently triggered by Calendar and could be triggered by Gmail.

Bug: 16076571
Change-Id: I2c55262a87e46ba88f36a90a2f8f27d08f88e851
 2014-07-22 12:00:10 +00:00
Dianne Hackborn
ff795ffba8 Unify voice interactor and recognizer settings. 
There is now one settings UI to select both the new
voice interactor and old voice recognizer.

There are still a few wonky things about this that won't
be resolved until we start requiring that all interactors
specify an associated recognizer service.

Change-Id: Ib702ff717fb28bcb244cb30e49577066ddc9f197
 2014-07-21 20:14:43 -07:00
Jason Monk
956cc191df am 08ac9bc6: am 77fe5373: am 724ec85e: Merge "Add Screen pinning back to settings" into lmp-dev 
* commit '08ac9bc6063af2e265964e1c8d650da536af10b7':
  Add Screen pinning back to settings
 2014-07-21 19:23:46 +00:00
Jason Monk
27d7ea56f3 Add Screen pinning back to settings 
Adds a basic screen for screen pinning (previously lock-to-app) to
settings that describes the feature and allows it to be turned on
and off.

Bug: 16378448
Depends on Ide333463f86310eacb7a1d8b6dc7b1aea8722713 for Settings
constant
Change-Id: Id3ef8471794aa01de20efeb947bed95c50d6b954
 2014-07-21 09:01:43 -04:00
Adam Lesinski
f174153e84 am 3a2a4720: am 3becea17: am 8d7be7b7: Update Settings to use new UsageStats API 
* commit '3a2a4720c175b0dfacace18bade0f99b09e056f4':
  Update Settings to use new UsageStats API
 2014-07-20 02:27:45 +00:00
Adam Lesinski
8d7be7b738 Update Settings to use new UsageStats API 
Change-Id: I89740d9b0c21f1ac6aa68feedc7730dd98b244c9
 2014-07-18 14:35:54 -07:00
PauloftheWest
2e6e981518 am e25fcbf1: am 72e4a85b: am 772cf206: Merge "Minor string fixes for translation" into lmp-dev 
* commit 'e25fcbf1f4eebf2aa588522f5d9aa248e77a8e0e':
  Minor string fixes for translation
 2014-07-18 19:05:05 +00:00
PauloftheWest
772cf20616 Merge "Minor string fixes for translation" into lmp-dev 2014-07-17 21:58:28 +00:00
PauloftheWest
60105a966a Minor string fixes for translation 
Bug: 16321903
Bug: 16321706
Bug: 16321066
Bug: 16321704
Change-Id: I65d0d8c89a8d0e7bf2ff2280aab32cd63b9fe369
 2014-07-18 11:04:13 -07:00
Tadashi G. Takaoka
3ac7802ee6 Fix duplicate string resources 
Change-Id: I33fd2e236f7462fc8a8fd14f56226e21d74a0311
 2014-07-17 18:07:26 -07:00
John Spurlock
de42b8b62e Settings: No really, keep the trailing space. 
Bug:16487510
Change-Id: Ic10ace9803c7d488240d819427ffec412a10d81a
 2014-07-22 15:17:49 -04:00
Amith Yamasani
a81d42e77f am 0e62c43d: am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev 
* commit '0e62c43d72c1c66c6f9790c8771d5e2c465d8f75':
  Improvements to user settings
 2014-07-18 15:10:35 +00:00
Tadashi G. Takaoka
1c88aa8848 am 02d8341c: am 740de4d3: am 3ac7802e: Fix duplicate string resources 
* commit '02d8341ca4dc3db2262eac8ce4bd56de46687655':
  Fix duplicate string resources
 2014-07-18 03:14:28 +00:00
PauloftheWest
6c023caec0 am e4a04c83: am 995448c7: am 08ee22cb: Merge "Removed extraneous string from strings.xml" into lmp-dev 
* commit 'e4a04c83f5d8928262a5fdc4ff993917d43cd2d5':
  Removed extraneous string from strings.xml
 2014-07-17 21:59:56 +00:00
Dianne Hackborn
0ba35a9b12 am 8280f115: am d0a94769: am be875db5: Merge "Battery chart fixes." into lmp-dev 
* commit '8280f115ed511100cd981141ee8301ce723d2ceb':
  Battery chart fixes.
 2014-07-17 21:04:17 +00:00
Fabrice Di Meglio
1fbd1d8e95 am 4f9f25ac: am 9b435f29: Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 
* commit '4f9f25ac6ce72fce54e3ae9b786dcadc28805ce4':
  Fix bug #15702424 add-wifi setting screen has no title
 2014-07-17 18:19:13 +00:00
Chris Craik
f12b150be5 am 7babd055: Merge "Accessibility text contrast control" into lmp-dev 
* commit '7babd05509ea33f507f3525fbe065093d5877779':
  Accessibility text contrast control
 2014-07-17 18:19:12 +00:00
Andres Morales
c1ddf4e6b5 am 0128374a: Increase oem_unlock_enable char limit for translation 
* commit '0128374aae5f9b748ade7d347fd267969ce726b9':
  Increase oem_unlock_enable char limit for translation
 2014-07-17 18:19:11 +00:00
PauloftheWest
6da8b0c99a am f3282c50: Merge "Corrected mispelling in strings.xml" into lmp-dev 
* commit 'f3282c500141023508bd1e08fd5cb6913a8e32df':
  Corrected mispelling in strings.xml
 2014-07-17 18:16:27 +00:00
PauloftheWest
18099f716c am b64a1f2f: Merge "Added Wifi Assistant Card" into lmp-dev 
* commit 'b64a1f2fde227153510bd9147c05fb31bddd5a14':
  Added Wifi Assistant Card
 2014-07-17 18:16:26 +00:00
Amith Yamasani
d0a057ccc8 Merge "Improvements to user settings" into lmp-dev 2014-07-17 17:59:02 +00:00
Amith Yamasani
c16b73e92b Improvements to user settings 
Exiting guest mode from within guest user.
Updated assets and cleaned up/optimized some asset clipping code.

Bug: 15761851
Bug: 16355550
Change-Id: I431e92bac3cbedd46bd1e33cffc4d9f0c576ca69
 2014-07-17 20:22:08 -07:00
Dianne Hackborn
c19eb361a4 Battery chart fixes. 
When there is no data to show, don't make a crazy collapsed chart.

Also avoid re-creating the chart when scrolling.

And fix various other things.

Change-Id: Ia1895bc7c46e6d830e66f66e66f17726e1e23e3f
 2014-07-17 12:09:54 -07:00
Fabrice Di Meglio
e817a66e83 Fix bug #15702424 add-wifi setting screen has no title 
- pass the missing EXTRA_SHOW_FRAGMENT_TITLE_RESID
- define a new string for the Activity title
- code cleaning: remove a non needed call to getIntent()

Change-Id: I430d59c0225c6e7f23e78edf5644d07ef33a9d98
 2014-07-16 19:51:06 -07:00
PauloftheWest
08ee22cb35 Merge "Removed extraneous string from strings.xml" into lmp-dev 2014-07-17 02:29:54 +00:00
PauloftheWest
44b6f51042 Removed extraneous string from strings.xml 
Change-Id: I68db708eed866f644a2443bdc90582ae3e5c85eb
 2014-07-17 12:49:19 -07:00
Andres Morales
0128374aae Increase oem_unlock_enable char limit for translation 
Bug: 16220494
Change-Id: I3974b241bc57130e518dab4b20348e698a276854
 2014-07-17 01:03:02 +00:00
Fabrice Di Meglio
9b435f29d7 Merge "Fix bug #15702424 add-wifi setting screen has no title" into lmp-dev 2014-07-16 23:30:53 +00:00
Chris Craik
7babd05509 Merge "Accessibility text contrast control" into lmp-dev 2014-07-16 22:04:55 +00:00
Chris Craik
fc72424cd7 Accessibility text contrast control 
b/14624452

Change-Id: I0f6708680eb37cf8e7dc63cae56b639eaf7c8dbd
 2014-07-16 18:04:26 -07:00
PauloftheWest
b97f2efd88 am 4de66531: am 55245894: Merge "Added strings for PBAP and MultiSim" into lmp-dev 
* commit '4de665314a8443f4b8913bc145f1de43144bc168':
  Added strings for PBAP and MultiSim
 2014-07-16 17:53:11 +00:00