drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
338,784 Commits 1 Branch 0 Tags
Commit Graph

749 Commits

Author SHA1 Message Date
Bill Yi
58f429278d Revert "Import translations. DO NOT MERGE" 
This reverts commit 58d65a51d4a11272e23e0e0335efb9f25d62fb0b.
Exempt-From-Owner-Approval: translation import

Change-Id: I0871fb39c8c152d7d7926871270e3a652fbd0b77
 2017-08-14 13:37:04 +00:00
Bill Yi
58d65a51d4 Import translations. DO NOT MERGE 
Change-Id: I1832b190126f6515f7d280611101c6c7884382ef
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-12 07:05:10 -07:00
The Android Open Source Project
4e3d4235c8 Import translations. DO NOT MERGE 
Change-Id: I946d40e430aa3b574f5e710e25a633edbb67553c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-08 17:09:06 -07:00
jackqdyulei
e685cc06a8 Merge "Update string for not charging." into oc-mr1-dev am: ed0c5cf48f 
am: 205afa7bd6

Change-Id: I5b669558511845402fbda458c748dce1c931733f
 2017-08-08 19:42:54 +00:00
jackqdyulei
205afa7bd6 Merge "Update string for not charging." into oc-mr1-dev 
am: ed0c5cf48f

Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c
 2017-08-08 19:35:24 +00:00
TreeHugger Robot
ed0c5cf48f Merge "Update string for not charging." into oc-mr1-dev 2017-08-08 19:27:29 +00:00
Bill Yi
158bd8c90e Import translations. DO NOT MERGE 
Change-Id: Ib2fd9bee8040fa4c57a62cbf22a64361201ab7cd
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-05 18:33:48 -07:00
Bill Yi
4f2d65e063 Import translations. DO NOT MERGE 
Change-Id: I2c6419d6531613745bd3911f59bec65c2cbcbf51
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-01 16:55:49 -07:00
Bill Yi
b2dd385f3c Import translations. DO NOT MERGE 
Change-Id: I21da6c2dd8cc902bdf6748efd4f7b0fce94fd2d2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-08-01 16:44:16 -07:00
pkanwar
116e619f27 Add string needed to support carrier wifi in UI. am: bf7ceec031 
am: 5a2b73b288

Change-Id: I906587f10a122ec142871253103b7bfa9a2c1fd6
 2017-07-31 01:52:39 +00:00
pkanwar
5a2b73b288 Add string needed to support carrier wifi in UI. 
am: bf7ceec031

Change-Id: I669fcd9904e23943ecd2dd0a9f558209fd00b1c5
 2017-07-31 01:44:09 +00:00
pkanwar
bf7ceec031 Add string needed to support carrier wifi in UI. 
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.

Bug:30988281
Test: manual
Change-Id: I41e63ce831dface4f2baf2879dde84ebe2fecc94
 2017-07-30 17:59:27 +00:00
Bill Yi
03d4052fcf Import translations. DO NOT MERGE 
Change-Id: I757ee47abb27616c1a9112490c805375e8710ec7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-28 01:44:25 -07:00
Bill Yi
9059e3ee2e Import translations. DO NOT MERGE 
Change-Id: I03b1c82e67b566797ce5c66136bbb5a981b6cb4b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-28 01:38:37 -07:00
jackqdyulei
02e8cd599d Update string for not charging. 
This string means that even though charger is connected, the charger
is not charging the battery

Bug: 37546354
Test: Build
Change-Id: Ib7000047eb97623132f681d0c12833ed1ce385e6
 2017-07-27 01:00:25 +00:00
Bill Yi
f11b91b94e Import translations. DO NOT MERGE 
Change-Id: I616171beaec9b4a90da7f0c726db79bef1ea066f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-26 10:21:07 -07:00
Bill Yi
ee8dd9c373 Import translations. DO NOT MERGE 
Change-Id: Ia56580662240b965d77ec102ea91a8b0ea5a8bab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-26 08:05:55 -07:00
Salvador Martinez
ab7fb5369f Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04 am: f68823e51e 
am: e94731c47b

Change-Id: I7efc491a0b9fda7e13b5812e9746147e6bb6af29
 2017-07-25 00:18:22 +00:00
Salvador Martinez
e94731c47b Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev am: f104b68a04 
am: f68823e51e

Change-Id: I291ec343b9c774449203c1c519e9685fbc19c552
 2017-07-25 00:10:27 +00:00
Salvador Martinez
ac791f4454 Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev 
am: f104b68a04

Change-Id: Id549831e1061088cefd261f460febcb7b3a3cb3f
 2017-07-25 00:05:50 +00:00
Salvador Martinez
f68823e51e Merge "move icon so that inline actions in settings can use it" into oc-dr1-dev 
am: f104b68a04

Change-Id: I83321a143a402f0babebca140a01bdacf26feb4d
 2017-07-25 00:05:01 +00:00
Salvador Martinez
52737f9266 move icon so that inline actions in settings can use it 
Test: tests still pass
Bug: 62022517
Change-Id: Ifc01797c6ada51130586b5b42570c3357923ef85
 2017-07-24 13:06:18 -07:00
TreeHugger Robot
69e41a4e9c Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-22 16:31:16 +00:00
TreeHugger Robot
6ca1df654f Merge "Import translations. DO NOT MERGE" 2017-07-22 16:04:48 +00:00
Bill Yi
19a8d0af26 Import translations. DO NOT MERGE 
Change-Id: I1670c714954e5835f6c79f446c463ee18d72d17b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-22 02:47:35 -07:00
Bill Yi
53e8be7921 Import translations. DO NOT MERGE 
Change-Id: Id35d21a3bd768e8ab9bcb946c66cf18790393ee2
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-22 02:36:03 -07:00
Matthew Fritze
572d4e4adf Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 am: 1986c25da7 
am: 0e7fc49139

Change-Id: I45ce0a0dbe7605eca86344e507042d7badc96059
 2017-07-22 03:50:53 +00:00
Matthew Fritze
0e7fc49139 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev am: 1cc73a5773 
am: 1986c25da7

Change-Id: I7ddd29766ecb6a4315ab635b16b2f480cc4915a8
 2017-07-22 03:44:10 +00:00
Matthew Fritze
5e4b071704 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev 
am: 1cc73a5773

Change-Id: I7bba78003073c79aaf692a01f0f6980b40e45598
 2017-07-22 03:37:47 +00:00
Matthew Fritze
1986c25da7 Merge "Move icon resources into SettingsLib for phone buddy" into oc-dr1-dev 
am: 1cc73a5773

Change-Id: Iebb70bf9db4c3eabf0aecd07a0ecf9178ff8944b
 2017-07-22 03:37:46 +00:00
Matthew Fritze
ab8148f2f6 Move icon resources into SettingsLib for phone buddy 
The external settings api needs to pass icons for
corresponding settings. The following signals didn't have
icons in Settings.
- Night display
- Location

Bug: 62706782
Test: make RunSettingsGoogleRoboTests
Change-Id: Ia2feaa9cfea7dbce165545e5b7d96ad0798b8e07
 2017-07-21 17:39:58 -07:00
Bill Yi
c87481965f Import translations. DO NOT MERGE 
Change-Id: I9905307a26573e5e19db63f85ba4a89bab47b166
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-21 12:05:22 -07:00
TreeHugger Robot
9d64f1357f Merge "Import translations. DO NOT MERGE" 2017-07-20 09:46:18 +00:00
Bill Yi
a7a70f7e10 Import translations. DO NOT MERGE 
Change-Id: I2ed6f707aa5196125419a43b85be6b9644364c24
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-19 21:48:02 -07:00
Bill Yi
c17fef27e1 Import translations. DO NOT MERGE 
Change-Id: I3a8a8d4641bd93f1dab442d2c0604f3878075580
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-19 21:39:35 -07:00
TreeHugger Robot
2a0e61f1db Merge "Add Wifi's security type to contentDescription" 2017-07-19 23:31:56 +00:00
TreeHugger Robot
a54c89ec56 Merge "Standardize usages of "/" separator in SettingsLib" 2017-07-19 20:39:10 +00:00
Fan Zhang
60b850de5e Add Wifi's security type to contentDescription 
Change-Id: I0c1945fd8776814ddf0097c0c1f27ed4dd1c73b2
Fix: 63805288
Test: robotests
 2017-07-19 09:22:49 -07:00
Glen Kuhne
446afac159 Add FailureReason to WifiConfiguration 
Added a new field that caches extra details about connection failures so
that they may be surfaced in the UI.

Bug: 62915994
Test: Manual...
Change-Id: I6e7860df4ea755e72fbdd4b6bf514338f2f1de80
 2017-07-18 14:03:32 -07:00
TreeHugger Robot
e1951ac1d5 Merge "Internationalize ZoneGetter properly" 2017-07-18 19:42:07 +00:00
Roozbeh Pournader
5b81031a2f Internationalize ZoneGetter properly 
Previously, the string for "GMT", as well as the digits and the
positive and negative signs for timezones were hardcoded (these
should have been different for various locales that use native digits
or an actual minus sign). Also, the number of digits used for the
hour was hardcoded to be two, where for Czech and Finnish they should
only use one digit if the hour is less than ten.

Fixes: 63675397
Bug: 63652836
Test: make -j RunSettingsLibRoboTests
Test: make -j RunSettingsRoboTests
Test: Checked time zone picker in Settings under en-US, fa-IR, ar-EG,
      cs-CZ, he-IL, sq-AL, and fr-FR.

Change-Id: I65191429b8b562f77977b1aa4a7db86a779dddc8
 2017-07-17 15:13:06 -07:00
Sundeep Ghuman
d3171ca2a1 Standardize usages of "/" separator in SettingsLib 
This separator should be translated the same as the
preference_summary_default_combination used in the Settings app. We
reintroduce this string here in order to avoid a dependency from
SettingsLib to Settings app.

Bug: b/62354743
Test: NA - Refactor
Change-Id: I2ce12848b944417b0df5e6f629aabd49712ff634
 2017-07-14 14:08:44 -07:00
TreeHugger Robot
31b8eece03 Merge "Import translations. DO NOT MERGE" 2017-07-14 00:58:21 +00:00
TreeHugger Robot
183f9ac263 Merge "Remove duplicate attrs." 2017-07-13 21:35:42 +00:00
Doris Ling
db0ec7d60f Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev 
am: 9f675cee28

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
 2017-07-13 21:15:21 +00:00
TreeHugger Robot
9f675cee28 Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev 2017-07-13 20:59:39 +00:00
Fan Zhang
449d5f7c26 Remove duplicate attrs. 
The attr is already defined in support lib. We no long need it after
linking symbol tables correctly in build.

Test: builds
Change-Id: Ib5f2ded9315e453937ea5c3769a9a27e59fc4f1e
 2017-07-13 11:19:40 -07:00
Doris Ling
a9fbf3817a Update the max height/width attribute of the TwoTargetPreference icon. 
Change the namespace for the icon image view to settings package.

Change-Id: Id1ffbc1742bedab93c9f03e9d464f532fe2c33af
Fix: 63666970
Test: Visual
(cherry picked from commit a990b5da04b4f5d475ff038f99d7dd908e931d63)
 2017-07-13 17:41:24 +00:00
Bill Yi
aaba1d30a3 Import translations. DO NOT MERGE 
Change-Id: I0d916ea4bce1d259de0703e12701b534f31178a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-13 06:42:58 -07:00
Bill Yi
5e25db519f Import translations. DO NOT MERGE 
Change-Id: I3d39526c8badcabd58705e76e8ad8707e8299d1c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
 2017-07-13 06:37:51 -07:00