Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,600 Commits 1 Branch 0 Tags
2bda0451ba5e0152343ba2b400fb6f8cf2f5b879
Commit Graph

7600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
2bda0451ba am 04df8b77: Iteration on multi-user storage UI. 
* commit '04df8b77a40c06488a954a22cc5be638179b7747':
  Iteration on multi-user storage UI.
 2012-09-07 16:42:32 -07:00
Jeff Sharkey
6bbe4e1f1e am 96c2f8c5: Progress towards split storage categories. 
* commit '96c2f8c50865e823e710be4d92f1589f978f03c2':
  Progress towards split storage categories.
 2012-09-07 13:46:23 -07:00
Elliott Hughes
f4bc651727 am 88220b72: am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings." 
* commit '88220b72044392f0cbfecb24c84e6a63e82be25c':
  Stop using getDSTSavings.
 2012-09-07 13:44:37 -07:00
Elliott Hughes
277b3e7edc am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master 
* commit '105d879ccef2517a07a15f29b956be739504fa73':
  Stop hard-coding sample 12- and 24-hour times.
 2012-09-07 13:44:32 -07:00
Baligh Uddin
91ea2772cc am d4e216bc: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 
* commit 'd4e216bc9eb9b8aecd031a5f3c2a412857333a99':
  Revert "Import translations. DO NOT MERGE"
 2012-09-07 13:42:09 -07:00
Baligh Uddin
b813131b09 am d2dec8c7: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'd2dec8c70eb8f745425c09070069ef52d306b233':
  Import translations. DO NOT MERGE
 2012-09-07 13:41:57 -07:00
The Android Open Source Project
841f2d2e17 am 710aeba1: (-s ours) am c53ce268: (-s ours) Reconcile with jb-release - do not merge 
* commit '710aeba1ce0bf2d121aaaf659284074750b43c6e':
 2012-09-07 13:40:53 -07:00
Jeff Sharkey
04df8b77a4 Iteration on multi-user storage UI. 
Adds headers to distinguish between current and other users.  Also
correctly orders color chips.

Bug: 7003520
Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
 2012-09-07 13:23:55 -07:00
Jeff Sharkey
96c2f8c508 Progress towards split storage categories. 
Cleans up StorageVolumePreferenceCategory creation, and uses new
isPrimary() API instead of passing around hacky "i == 0" derived
value.

Bug: 7003520
Change-Id: I9eb7164035b5368ee795e35b22e750aebbf3b159
 2012-09-06 23:21:09 -07:00
Elliott Hughes
88220b7204 am 4ad02d02: am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings." 
* commit '4ad02d02b8a27c627eace2bdf1fe8e0b3cfe08fb':
  Stop using getDSTSavings.
 2012-09-06 16:41:16 -07:00
Elliott Hughes
4ad02d02b8 am a76ba7bb: am cfbc61de: Merge "Stop using getDSTSavings." 
* commit 'a76ba7bb301e2349541ddeeb492d3bf4f6e6b70c':
  Stop using getDSTSavings.
 2012-09-06 16:40:09 -07:00
Elliott Hughes
105d879cce am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master 
* commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9':
  Stop hard-coding sample 12- and 24-hour times.
 2012-09-06 16:39:41 -07:00
Elliott Hughes
a76ba7bb30 am cfbc61de: Merge "Stop using getDSTSavings." 
* commit 'cfbc61de3f94a620153ca83a790e4d1b03a9078e':
  Stop using getDSTSavings.
 2012-09-06 16:38:37 -07:00
Elliott Hughes
98d9380a5c am 680c8c8e: resolved conflicts for merge of 33f86196 to stage-aosp-master 
* commit '680c8c8e43804d9bf69568d4748b3bd3a4aea0ee':
  Stop hard-coding sample 12- and 24-hour times.
 2012-09-06 16:37:44 -07:00
Elliott Hughes
680c8c8e43 resolved conflicts for merge of 33f86196 to stage-aosp-master 
Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
 2012-09-06 16:09:04 -07:00
Elliott Hughes
cfbc61de3f Merge "Stop using getDSTSavings." 2012-09-06 15:50:10 -07:00
Elliott Hughes
6c7f55ee4b Stop using getDSTSavings. 
The original code was actually correct, but code calling inDaylightTime
and getDSTSavings directly is inherently suspect, so I want to clean up
this false positive along with the real abusers.

Bug: 6901488
Change-Id: I6c89e7aa29d88b81ed2c7fd6c915e0346b90a442
 2012-09-06 15:42:09 -07:00
Elliott Hughes
33f8619677 Merge "Stop hard-coding sample 12- and 24-hour times." 2012-09-06 15:29:47 -07:00
Elliott Hughes
82723df002 Stop hard-coding sample 12- and 24-hour times. 
Bug: 6881640
Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
 2012-09-06 14:49:35 -07:00
Baligh Uddin
d4e216bc9e Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-dev 2012-09-06 11:16:17 -07:00
Baligh Uddin
cbc213e54c Revert "Import translations. DO NOT MERGE" 
Broke the build.

This reverts commit 9dcb0727d0

Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
 2012-09-06 11:15:52 -07:00
Baligh Uddin
d2dec8c70e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-06 10:53:13 -07:00
The Android Open Source Project
710aeba1ce am c53ce268: (-s ours) Reconcile with jb-release - do not merge 
* commit 'c53ce26836eccfe9c0bb315d965bc73a9bd7b214':
 2012-09-06 08:21:38 -07:00
The Android Open Source Project
c53ce26836 Reconcile with jb-release - do not merge 
Change-Id: I34fdfc427ea0fd0dc887303e7c019226a665f4de
 2012-09-06 08:09:26 -07:00
Charles Chen
ee04e47216 Merge "Add content descriptions to power control widget." into jb-mr1-dev 2012-09-05 17:13:24 -07:00
Baligh Uddin
9dcb0727d0 Import translations. DO NOT MERGE 
Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822
Auto-generated-cl: translation import
 2012-09-05 14:02:53 -07:00
John Spurlock
1537e8b3e8 Dream settings: list items back to constant height 
Expanding/collapsing items removed, settings icon shown on right
with divider if applicable.

New "Start" action on the action bar to start dreaming.  This is
no longer in preview/test mode, but a call to .dream().

Bug: 7010260
Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
 2012-09-05 10:28:49 -04:00
Matthew Xie
952146ee8f Merge "Clear profile connnection status of bonded devices when BT is turned off" into jb-mr1-dev 2012-09-04 15:31:04 -07:00
Ganesh Ganapathi Batta
7951b43bd9 Clear profile connnection status of bonded devices when BT is turned off 
When BT is turned off in mid of a profile connection, sometimes
profile connection status change message with status= DISCONNECTED
does not reach Settings app which results in stale connection status
for the device when BT is enabled next time. Fixed the issue
By explicitly clearing the connection status for all paired devices
when BT is turning OFF

Change-Id: I5d0c158636f3b62eff9094821abe2ef3a7cab16e
 2012-09-04 15:18:25 -07:00
Przemyslaw Szczepaniak
22dc1fe2ba Make TTS languages list sorted. 
Also makes sure that languages list always have underlying array after onCreate.

Bug: 5640782
Change-Id: Id85d0099efccc9a64458d24853b5c98a35307b38
 2012-09-03 15:51:34 +01:00
Mathias Agopian
c888555f89 FIX BUILD (DO NOT MERGE) 
Revert "Import translations. DO NOT MERGE"

This reverts commit b3e78cc41f.

Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
 2012-08-31 02:23:24 -07:00
Baligh Uddin
f9e25e833f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-30 22:10:16 -07:00
Amith Yamasani
788cde4ce4 Rename settings title for user management screen 
Change-Id: I0a57d52eb0c4e4fb8a8ab1449b98751927da2519
 2012-08-30 17:25:20 -07:00
alanv
b9062f2678 Add content descriptions to power control widget. 
Bug: 6361285
Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
 2012-08-30 17:08:01 -07:00
Jeff Sharkey
037df2cb18 Merge "Surface storage usage of other users." into jb-mr1-dev 2012-08-30 15:26:50 -07:00
Jeff Sharkey
90c8b20ccf Surface storage usage of other users. 
Bring up separate StorageMeasurement sessions bound to other users
on device, and surface their total usage as teal colors.  Exclude
app code size when measuring secondary users.  Shift preferences to
using keys instead of fragile index ordering.

Bug: 7003520
Change-Id: I214d0b223e53955df71104502596743f049f2027
 2012-08-30 15:24:53 -07:00
John Spurlock
7af2aa52ac More traditional list item style for dreams settings. 
Other improvements:
 - remove "Start dreaming now", promote "When to dream" to action bar
 - added logging
 - hide dream settings button if n/a
 - new flat style for settings/preview + dividers
 - refresh dreams list when packages are installed/uninstalled
 - added placeholder for help url

Bug:7010260
Change-Id: Ia443b4f76678eaf1a52b907d50aefb0d8f7e4748
 2012-08-30 16:28:29 -04:00
Baligh Uddin
b3e78cc41f Import translations. DO NOT MERGE 
Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3
Auto-generated-cl: translation import
 2012-08-29 20:17:20 -07:00
John Spurlock
2dff5b109b Merge "New dream settings - first cut" into jb-mr1-dev 2012-08-29 15:55:25 -07:00
The Android Automerger
9f1ebc2272 merge in jb-release history after reset to jb-dev 2012-08-29 14:29:55 -07:00
John Spurlock
6df18e2713 New dream settings - first cut 
First draft implementation of mocks for dream settings.

Want to merge for the weekly build, so a few things remain, namely:
  - flat style for preview/settings buttons + dividers
  - animation between dream row expanded/collapsed state
  - wire up the help url
  - possibly ditch the non-standard style
  - add logging
  - refresh when packages are installed/uninstalled

Bug:7010260
Change-Id: I96e3ab944170925bd76edf7b8b1127adfffc6262
 2012-08-29 16:41:01 -04:00
The Android Automerger
49c743c864 merge in jb-release history after reset to jb-dev 2012-08-29 12:43:12 -07:00
Jeff Brown
b2b54eec86 Add new setting to control overlay displays. 
Change-Id: I9582bb149dca716699ef5977ef8f84bb3136e0c0
 2012-08-29 06:15:23 -07:00
Baligh Uddin
c6015d2f59 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-28 15:15:09 -07:00
Baligh Uddin
54762ab2bc Import translations. DO NOT MERGE 
Change-Id: I884b6bb2bd0045049a7578235563896afe9414a7
Auto-generated-cl: translation import
 2012-08-28 14:29:09 -07:00
Nick Kralevich
7e7912de4f ChooseLockPassword: allow spaces in passwords 
This fixes http://code.google.com/p/android/issues/detail?id=35988

Change-Id: I1880d7e41028f034e75a048226cce3bf96845a09
 2012-08-28 13:41:37 -07:00
Wink Saville
ca786f3989 am c5fc6231: am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity" 
* commit 'c5fc6231312b21efb601367bae28d63f9b26ac52':
  Fix memory leak in ApnSettings-activity
 2012-08-28 12:18:57 -07:00
Wink Saville
c5fc623131 am 2d6b52bd: Merge "Fix memory leak in ApnSettings-activity" 
* commit '2d6b52bd38046abe1761cf0cc1f0c415e4a24fef':
  Fix memory leak in ApnSettings-activity
 2012-08-28 12:13:59 -07:00
Wink Saville
2d6b52bd38 Merge "Fix memory leak in ApnSettings-activity" 2012-08-28 12:01:29 -07:00
Jean-Baptiste Queru
72d3f85d09 am 300457ba: am 38ce5194: Merge "Enable to delete a stored persistent group from p2p settings." 
* commit '300457bad289f547430da21e72747e8840840832':
  Enable to delete a stored persistent group from p2p settings.
 2012-08-28 11:15:22 -07:00