Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,698 Commits 1 Branch 0 Tags
57c4ddcb15b157a0f29e92624b7bfd1348a5e81c
Commit Graph

7613 Commits

Author SHA1 Message Date
Daichi Hirono
396366eda9 am 5c1542e6: am 95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev 
* commit '5c1542e6fdfc619ed5bc5ded2a2dfa29d7082c5d':
  Change the color of format button in "Device storage > Format" screen.
 2015-06-24 05:41:40 +00:00
Daichi Hirono
5c1542e6fd am 95029c97: Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev 
* commit '95029c97019f90499fbce040b8b7971a8de680ec':
  Change the color of format button in "Device storage > Format" screen.
 2015-06-24 05:29:49 +00:00
Daichi Hirono
95029c9701 Merge "Change the color of format button in "Device storage > Format" screen." into mnc-dev 2015-06-24 05:22:03 +00:00
Daichi Hirono
c8463895a8 Change the color of format button in "Device storage > Format" screen. 
BUG=21898857

Change-Id: Ic1619482f5294b6f2d1e14154bab25103ec3b630
 2015-06-24 14:17:06 +09:00
Lifu Tang
55601622d5 Language Update for Wi-Fi/Bluetooth Scanning 
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
 2015-06-23 18:54:27 -07:00
Selim Cinek
f3834ed1b5 am c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 
* commit 'c9d3f895295c578652f13b331bec1fe02394224b':
  Added contentDescription for fingerprint on the confirmCredential screen
 2015-06-23 23:17:37 +00:00
Selim Cinek
c9d3f89529 am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 
* commit 'ae3693d44f036f99c0a32a18dda0a4ff312e456a':
  Added contentDescription for fingerprint on the confirmCredential screen
 2015-06-23 22:12:05 +00:00
Selim Cinek
ae3693d44f am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 
* commit '1726b2c94d994843abe43283465be7c049763b94':
  Added contentDescription for fingerprint on the confirmCredential screen
 2015-06-23 22:02:04 +00:00
Selim Cinek
1726b2c94d Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 2015-06-23 21:50:27 +00:00
Selim Cinek
cf8347b33f Added contentDescription for fingerprint on the confirmCredential screen 
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
 2015-06-23 17:48:48 -04:00
Sanket Padawe
1f23207509 am b43128ab: am 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 
* commit 'b43128abd9329eec01016b80ece97a3cad3cae88':
  Align Enlish words to RTL in RTL context in networkreset Settings.
 2015-06-23 05:38:48 +00:00
Sanket Padawe
a129c1e1f8 am bf4849c8: am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 
* commit 'bf4849c8bb5b16adf51dcdbad18a42c705bf918d':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
 2015-06-23 05:38:47 +00:00
Sanket Padawe
b43128abd9 am 088c6d68: am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 
* commit '088c6d68c2ae9560842d66d71a77783c370ac2e3':
  Align Enlish words to RTL in RTL context in networkreset Settings.
 2015-06-23 03:20:57 +00:00
Sanket Padawe
bf4849c8bb am a8c6cb5a: am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 
* commit 'a8c6cb5a72974118adb7f39acb3a906a63541dac':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
 2015-06-23 03:20:29 +00:00
Sanket Padawe
088c6d68c2 am 2bed3a50: Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 
* commit '2bed3a507faaab29569857fd7a92b739faa31ee3':
  Align Enlish words to RTL in RTL context in networkreset Settings.
 2015-06-23 02:57:29 +00:00
Sanket Padawe
2bed3a507f Merge "Align Enlish words to RTL in RTL context in networkreset Settings." into mnc-dev 2015-06-23 02:47:28 +00:00
Sanket Padawe
bf91bc6bd3 Align Enlish words to RTL in RTL context in networkreset Settings. 
Bug: 21553326
Change-Id: I216723172cc6998e1432d0a066f21a72afe1bc27
 2015-06-22 19:46:28 -07:00
Sanket Padawe
a8c6cb5a72 am 4044d6cd: Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 
* commit '4044d6cdd6309e06377ae57a4b941f2db87d6942':
  Fix display of "Contact sharing" option in Car kit for BT Settings.
 2015-06-23 00:43:57 +00:00
Sanket Padawe
4044d6cdd6 Merge "Fix display of "Contact sharing" option in Car kit for BT Settings." into mnc-dev 2015-06-23 00:34:37 +00:00
Alan Viverette
3a1e634a59 am be0c398c: am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit 'be0c398cdac1a4441e15e4cbc806dc23286de85d':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:57:00 +00:00
Alan Viverette
be0c398cda am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit '270353f659c2b6bdcf58c16f087c6e5cff810875':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:13:48 +00:00
Alan Viverette
270353f659 am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev 
* commit '8a4e44ba92d2c7552860d7e8d23015c013da32f4':
  Ensure "default" and "none" caption colors are consistent w/ framework
 2015-06-22 21:01:57 +00:00
Alan Viverette
751625e9a2 Ensure "default" and "none" caption colors are consistent w/ framework 
Also enables scroll indicators in color grid dialog.

Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
 2015-06-22 13:05:45 -07:00
Sanket Padawe
53e74f510b Fix display of "Contact sharing" option in Car kit for BT Settings. 
Bug: 21879473
Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
 2015-06-22 12:33:53 -07:00
Alan Viverette
9f8daa9ef0 am 6d11da55: am e7924ca8: am 14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev 
* commit '6d11da55a8af056f7062b71be26428ca120bfeff':
  Disable foreground opacity when using default foreground color
 2015-06-22 18:14:21 +00:00
Alan Viverette
6d11da55a8 am e7924ca8: am 14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev 
* commit 'e7924ca819ff7894214b935013a31d42cb95db8d':
  Disable foreground opacity when using default foreground color
 2015-06-22 17:41:27 +00:00
Alan Viverette
e7924ca819 am 14f5da9b: Merge "Disable foreground opacity when using default foreground color" into mnc-dev 
* commit '14f5da9b4d2cb1e0b6828312613bf8f4c8a1df2d':
  Disable foreground opacity when using default foreground color
 2015-06-22 17:27:31 +00:00
Alan Viverette
14f5da9b4d Merge "Disable foreground opacity when using default foreground color" into mnc-dev 2015-06-22 17:20:07 +00:00
Alan Viverette
529901decd Disable foreground opacity when using default foreground color 
Bug: 21602597
Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
 2015-06-22 10:07:19 -07:00
Jason Monk
e09535541d am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
  Update disable dialog
 2015-06-22 16:07:16 +00:00
Jason Monk
591aa6ae9e am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit 'd8c811d8b80d251630303afda518c8407424abae':
  Update disable dialog
 2015-06-22 15:54:26 +00:00
Geoff Mendal
e4841b38d0 Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-22 15:31:26 +00:00
Jason Monk
d8c811d8b8 am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit 'b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
  Update disable dialog
 2015-06-22 15:02:15 +00:00
Geoff Mendal
b593d12bea Import translations. DO NOT MERGE 
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
 2015-06-22 08:00:38 -07:00
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Geoff Mendal
e3ad3140aa Import translations. DO NOT MERGE 
Change-Id: Ifbdf3a7393773c14c7336c62c9935eea02353f1c
Auto-generated-cl: translation import
 2015-06-22 07:23:59 -07:00
Adrian Roos
952471b0e3 am e14151f9: am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit 'e14151f9c9761d4ccecb9fc677f7b291d287d8e0':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 05:44:35 +00:00
Adrian Roos
e14151f9c9 am 5023c89d: am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit '5023c89d24723f1fc8e5b176fab476d80484b974':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 03:41:02 +00:00
Adrian Roos
5023c89d24 am a029671b: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev 
* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
  Work around improper ListView recycling in TrustAgentSettings
 2015-06-20 03:28:00 +00:00
Adrian Roos
ba59f5b222 Work around improper ListView recycling in TrustAgentSettings 
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.

Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
 2015-06-19 20:01:56 -07:00
Jason Monk
0591282f2a am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
  Add content description to owner info status text
 2015-06-19 16:26:37 +00:00
Jason Monk
9c4c45b340 am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '6a7c756208555a41b4433b3a0ce12ef1c101215c':
  Add content description to owner info status text
 2015-06-19 16:15:37 +00:00
Jason Monk
6a7c756208 am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit 'd63e696902cbefaa7361aaa16e6b20d0fe593cdb':
  Add content description to owner info status text
 2015-06-19 15:33:37 +00:00
Jason Monk
2e78f53af1 Add content description to owner info status text 
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
 2015-06-19 11:17:03 -04:00
Brian Carlstrom
be12161f9e am 34e39e7c: am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev 
* commit '34e39e7cff699c9fb38c3d92276099ef99e97de8':
  Clarify process_dex2oat_label description
 2015-06-19 14:18:37 +00:00
Sanket Padawe
aac6357744 am 4ad7f625: am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33. 
* commit '4ad7f6254d195bd53369aa7fc5154f70d6fb42c3':
  Increase char limit of the data usage Settings string to 33.
 2015-06-19 14:18:35 +00:00
Brian Carlstrom
34e39e7cff am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev 
* commit '9dca3951f6abd2644b899c34c930da0456b7f814':
  Clarify process_dex2oat_label description
 2015-06-19 13:59:04 +00:00
Sanket Padawe
4ad7f6254d am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33. 
* commit 'aa10a9ec83a639498a1fe5ff483f05a668cdf773':
  Increase char limit of the data usage Settings string to 33.
 2015-06-19 13:58:57 +00:00
Brian Carlstrom
9dca3951f6 am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev 
* commit '2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
  Clarify process_dex2oat_label description
 2015-06-19 04:33:16 +00:00
Brian Carlstrom
2567514abc Merge "Clarify process_dex2oat_label description" into mnc-dev 2015-06-19 04:23:08 +00:00