Fan Zhang
798c93aafc
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82
...
am: 32fbf4740d
2019-02-13 10:29:46 -08:00
Fan Zhang
32fbf4740d
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
...
am: dabfd96c82
2019-02-13 10:16:15 -08:00
Fan Zhang
dabfd96c82
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""
2019-02-13 18:04:09 +00:00
Fan Zhang
1ea003e834
Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"
...
This reverts commit 910457e37ahttps://android-review.googlesource.com/q/topic:%22116821732%22+(status:open%20OR%20status:merged)
Has broken several builds (test_suites_x86_64, build_test, docs) with the following error:
FAILED:
build/make/core/aapt2.mk:33: error: overriding commands for target `out/target/common/obj/APPS/SetupWraith_intermediates/flat-res/frameworks/base/packages/SettingsLib/res/color_batterymeter_bolt_color.xml.flat', previously defined at build/make/core/aapt2.mk:33
05:05:47 ckati failed with: exit status 1
make: *** [run_soong_ui] Error 1
Return Code: 2
Change-Id: I2f6d443d06318b9bfa1283fb5f8255b126e4b507
2019-02-13 17:59:40 +00:00
Mark Chien
edc4fd30ea
Merge "Support entitlement check in DSDS" am: e3b4e0262c
...
am: 0ac1c323b2
2019-02-12 20:06:32 -08:00
Fan Zhang
80fd417a58
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile" am: 3905ad125d
...
am: dd3e2c4f27
2019-02-12 19:33:56 -08:00
Mark Chien
0ac1c323b2
Merge "Support entitlement check in DSDS"
...
am: e3b4e0262c
2019-02-12 19:25:31 -08:00
Fan Zhang
dd3e2c4f27
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
...
am: 3905ad125d
2019-02-12 18:41:40 -08:00
Mark Chien
e3b4e0262c
Merge "Support entitlement check in DSDS"
2019-02-13 02:29:01 +00:00
Kiyoung Kim
de1971d7a0
Merge "Schematize ADB system properties" am: 750b90a22b
...
am: 974ace22f9
2019-02-12 18:18:16 -08:00
Kiyoung Kim
974ace22f9
Merge "Schematize ADB system properties"
...
am: 750b90a22b
2019-02-12 18:06:33 -08:00
Fan Zhang
3905ad125d
Merge "Add LOCAL_RESOURCE_DIR in Settings makefile"
2019-02-13 00:12:08 +00:00
Treehugger Robot
750b90a22b
Merge "Schematize ADB system properties"
2019-02-12 18:35:23 +00:00
markchien
c992d0f4a9
Support entitlement check in DSDS
...
Get resource from preferred SIM's subId.
Bug: 122108346
Bug: 120069528
Test: atest TetherServiceTest
Change-Id: Ia4279a418dfa6cd14942b7f4d2a313156066381b
Merged-in: Ia4279a418dfa6cd14942b7f4d2a313156066381b
2019-02-12 16:17:36 +08:00
Kiyoung Kim
b941bc46b5
Merge "Schematize Display system properties" am: b139a4c16b
...
am: 4d8f4919e0
2019-02-11 19:25:50 -08:00
Kiyoung Kim
4d8f4919e0
Merge "Schematize Display system properties"
...
am: b139a4c16b
2019-02-11 19:13:51 -08:00
Kiyoung Kim
6ade19a3bf
Schematize ADB system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
Merged-In: Iec37f5f35b1452afdf7b15e9f31c4b4726127065
2019-02-12 02:58:11 +00:00
Treehugger Robot
b139a4c16b
Merge "Schematize Display system properties"
2019-02-12 02:50:08 +00:00
Stanley Tng
fdd54f74ed
Merge "Update the Hearing Aids Strings" am: 3afa2a7acb
...
am: f8ba53c6fb
2019-02-05 13:16:09 -08:00
Stanley Tng
f8ba53c6fb
Merge "Update the Hearing Aids Strings"
...
am: 3afa2a7acb
2019-02-05 13:05:41 -08:00
Treehugger Robot
3afa2a7acb
Merge "Update the Hearing Aids Strings"
2019-02-05 20:20:51 +00:00
Stanley Tng
d6f1b59c93
Update the Hearing Aids Strings
...
Minor update to the Hearing Aids string by making it plural and also
remove a redundant word "currently".
Bug: 121036176
Test: Compile
Change-Id: I829b8028408f5d07d950580bd4d90ca41bd334f3
2019-02-02 17:56:19 +00:00
Pavel Grafov
3184142cbe
Merge "Update to use new ConnectivityManager API." am: 70b1830e7e
...
am: 7c47743851
2019-01-28 21:34:50 -08:00
Pavel Grafov
7c47743851
Merge "Update to use new ConnectivityManager API."
...
am: 70b1830e7e
2019-01-28 20:28:09 -08:00
Pavel Grafov
70b1830e7e
Merge "Update to use new ConnectivityManager API."
2019-01-28 20:15:49 +00:00
Pavel Grafov
6a0a7be9a2
Update to use new ConnectivityManager API.
...
Bug: 77468593
Test: builds
Change-Id: I1fa542e015add2dd8b0e8620f2021c1a5c1c9f1a
2019-01-25 18:58:17 +00:00
Eran Messeri
a357cc9737
Merge "Add Enterprise owners for Enterprise settings" am: 35416e7529
...
am: 74bd41f305
2019-01-24 15:11:42 -08:00
Eran Messeri
74bd41f305
Merge "Add Enterprise owners for Enterprise settings"
...
am: 35416e7529
2019-01-24 15:03:28 -08:00
Treehugger Robot
35416e7529
Merge "Add Enterprise owners for Enterprise settings"
2019-01-24 22:56:27 +00:00
Dan Albert
11247ebb53
Merge "Revert "Update to use new ConnectivityManager API."" am: 9c7ddce334
...
am: 2105dc52dd
2019-01-24 13:49:58 -08:00
Dan Albert
2105dc52dd
Merge "Revert "Update to use new ConnectivityManager API.""
...
am: 9c7ddce334
2019-01-24 13:39:06 -08:00
Dan Albert
9c7ddce334
Merge "Revert "Update to use new ConnectivityManager API.""
2019-01-24 21:08:46 +00:00
Dan Albert
6e91f68ae4
Revert "Update to use new ConnectivityManager API."
...
This reverts commit 9a9f6f313b
2019-01-24 21:06:02 +00:00
Pavel Grafov
a9ed0226f5
Merge "Update to use new ConnectivityManager API." am: 161f5ec3e9
...
am: 525b0dbc17
2019-01-24 10:07:47 -08:00
Pavel Grafov
525b0dbc17
Merge "Update to use new ConnectivityManager API."
...
am: 161f5ec3e9
2019-01-24 09:50:37 -08:00
Pavel Grafov
161f5ec3e9
Merge "Update to use new ConnectivityManager API."
2019-01-24 17:34:55 +00:00
Eran Messeri
3cb95abd04
Add Enterprise owners for Enterprise settings
...
Add owners from the Android Enterprise team to source files that are
either owned or are mostly modified by the Android Enterprise team.
Test: gerrit uploader
Bug: 33166666
Change-Id: I8b4ec7c8895b02c45a6a14d52a3742334234904a
2019-01-24 12:29:56 +00:00
Pavel Grafov
9a9f6f313b
Update to use new ConnectivityManager API.
...
Bug: 77468593
Test: builds
Change-Id: I614c20b9a1c6748614163766866bb59b15d794f1
Merged-In: I614c20b9a1c6748614163766866bb59b15d794f1
2019-01-23 19:53:01 +00:00
Kiyoung Kim
59e3152a0e
Schematize Display system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: If0b7658e4f04848a6a068c18e93026591b7b5518
Merged-In: I83b40ddfcde32d8d03fae73f5c252013933c466c
2019-01-21 15:00:10 +09:00
Bill Yi
6aa71b3aef
[automerger skipped] Import translations. DO NOT MERGE
...
am: e60e0d2291
2019-01-19 14:46:03 -08:00
Bill Yi
e60e0d2291
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
2019-01-19 11:34:19 -08:00
Fan Zhang
3de14ebfa2
Merge "Add Dynamic tiles" am: 15bf05f6fd
...
am: 0d8ea3bfce
2019-01-17 17:26:39 -08:00
Fan Zhang
0d8ea3bfce
Merge "Add Dynamic tiles"
...
am: 15bf05f6fd
2019-01-17 17:08:14 -08:00
Fan Zhang
15bf05f6fd
Merge "Add Dynamic tiles"
2019-01-18 00:47:52 +00:00
jin.dong
b82df9bd43
Add Dynamic tiles
...
Add new CategoryKey for screens below:
about_legal.xml
my_device_info.xml
battery_saver_settings.xml
Bug: 113249409
Change-Id: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
Merged-In: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
2019-01-16 00:54:07 +00:00
Anton Hansson
850fdb32e9
Merge "Make the Settings permission a required module" am: 480b56e3d6
...
am: bc79e6e6f3
2019-01-14 08:15:32 -08:00
Anton Hansson
bc79e6e6f3
Merge "Make the Settings permission a required module"
...
am: 480b56e3d6
2019-01-14 08:11:21 -08:00
Anton Hansson
480b56e3d6
Merge "Make the Settings permission a required module"
2019-01-14 16:03:16 +00:00
Anton Hansson
09064cf6d9
Make the Settings permission a required module
...
This will include the Settings permission file whenever
the Settings app is installed.
Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271
2019-01-14 15:50:28 +00:00
Anton Hansson
403fe5d83c
Merge "Move Settings app to /product" am: 0a399bf543
...
am: 297fe94122
2019-01-14 01:50:56 -08:00
