Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,481 Commits 1 Branch 0 Tags
949e45c8afa6114232e50e56c684ecbe221e0bf4
Commit Graph

45481 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Ling
949e45c8af Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 am: d1146af517 
am: ad04140966

Change-Id: I14f35ecc0ac25bf95506b1ec5458a8dcf4b9b3ff
 2018-08-09 12:20:08 -07:00
Doris Ling
f2335b6567 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 am: 0f0147213e -s ours 
am: cfcfc6a677

Change-Id: I0c2d4ce5d64814a807bbc85be2a3be57dad3ab0a
 2018-08-09 12:18:06 -07:00
Doris Ling
ad04140966 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb am: 78a7ee2f10 
am: d1146af517

Change-Id: Ic63e27409f0e1b5fe3c4cb9d152c50d9f1cef351
 2018-08-09 12:13:30 -07:00
Doris Ling
cfcfc6a677 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f am: cff5200146 
am: 0f0147213e  -s ours

Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0
 2018-08-09 12:11:59 -07:00
Doris Ling
d1146af517 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb 
am: 78a7ee2f10

Change-Id: I82960fb637152698cb676fae82862408b1a2db75
 2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b am: 3672a1fe7f 
am: cff5200146

Change-Id: I44df485b49098b69371d1248067e51559dcd4964
 2018-08-09 12:03:48 -07:00
Doris Ling
78a7ee2f10 Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev 
am: 528be61eeb

Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
 2018-08-09 12:00:42 -07:00
Doris Ling
bedc0dce89 Disable changing lock when device is not provisioned. 
am: 770f4abf9d

Change-Id: Id94aa8ed209203f0bd70fd2c1cd9bc1ac51059cd
 2018-08-09 11:58:38 -07:00
Doris Ling
cff5200146 [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b 
am: 3672a1fe7f

Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
 2018-08-09 11:58:38 -07:00
TreeHugger Robot
528be61eeb Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev 
* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5
  DO NOT MERGE Disable changing lock when device is not provisioned.
 2018-08-09 18:34:12 +00:00
Jordan Liu
7bfad68128 Merge "Preserve leading 0s in mcc mnc" am: 593d767e15 am: c2a5c47290 
am: efd3dd02b6

Change-Id: I3f42a20035fb2be92e98c33dd16b59870b8ed481
 2018-08-08 15:55:34 -07:00
Jordan Liu
efd3dd02b6 Merge "Preserve leading 0s in mcc mnc" am: 593d767e15 
am: c2a5c47290

Change-Id: Id1a84cc4cc55fef4167f28ab0e665ebffe5d2c05
 2018-08-08 15:50:24 -07:00
Jordan Liu
c2a5c47290 Merge "Preserve leading 0s in mcc mnc" 
am: 593d767e15

Change-Id: I97041a9f2a50d8448a95226e66162b55a42f841b
 2018-08-08 15:46:32 -07:00
Jordan Liu
593d767e15 Merge "Preserve leading 0s in mcc mnc" 2018-08-08 22:21:40 +00:00
Jordan Liu
f546b97db9 Preserve leading 0s in mcc mnc 
Fixes: 79408450
Test: ApnEditorTest.java
Change-Id: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
Merged-In: Iad7ffe04f23b30857588e50d7f5f0dd307bd2c6e
 2018-08-08 11:35:15 -07:00
Xin Li
ecad848947 Merge "Merge Android Pie into master" am: eae6f13389 am: b745578205 
am: ffc0419e4f

Change-Id: If8a871860b5af69788ffecd79a3a4f38c4b764ef
 2018-08-07 22:54:42 -07:00
Xin Li
ffc0419e4f Merge "Merge Android Pie into master" am: eae6f13389 
am: b745578205

Change-Id: I6da67456fef37ea0df3b003c0190692e9aeaf571
 2018-08-07 18:37:11 -07:00
Xin Li
b745578205 Merge "Merge Android Pie into master" 
am: eae6f13389

Change-Id: I8da592027bd7658b9d900aa8fae529c4bf7a6a7d
 2018-08-07 15:06:54 -07:00
Xin Li
eae6f13389 Merge "Merge Android Pie into master" 2018-08-07 16:51:28 +00:00
Xin Li
40a1c33e24 Merge Android Pie into master 
Bug: 112104996
Change-Id: I4930d57cc584503a8e16e2b69549efb5780faad8
 2018-08-06 16:51:22 -07:00
Bill Yi
4dd2c1fa3d [automerger skipped] Import translations. DO NOT MERGE am: 000f97dcf9 -s ours 
am: 16191b3408  -s ours

Change-Id: I25c2d0e11f48a0cfa54bd1790ab858bbec109bc3
 2018-08-04 18:25:30 -07:00
Bill Yi
16191b3408 [automerger skipped] Import translations. DO NOT MERGE 
am: 000f97dcf9  -s ours

Change-Id: Ia6cce5c5529998a45fa52d353f63a8edc8e2c0ef
 2018-08-04 18:21:26 -07:00
Bill Yi
000f97dcf9 Import translations. DO NOT MERGE 
Change-Id: I89c83219dfbf228054284db00548647b94fc398b
Auto-generated-cl: translation import
 2018-08-04 07:43:29 -07:00
Android Build Merger (Role)
36a583e2ff [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 skipped: 1b622b07be 
Change-Id: I2755a79cc942e8dc063f3a420e0ed02817959cec
 2018-08-03 21:04:11 +00:00
Android Build Merger (Role)
1b622b07be [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 am: aaa67659a6 
Change-Id: I9c1ba2599a78d6518531a2bff2b899eecb3b6554
 2018-08-03 21:04:09 +00:00
Android Build Merger (Role)
aaa67659a6 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 am: 782fc16dc4 
Change-Id: Ic801ec29d08cf8600e3f04cd9b311d6fbbb315a8
 2018-08-03 21:04:08 +00:00
Android Build Merger (Role)
782fc16dc4 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 am: c056ac3011 
Change-Id: If73d439ccad4d5a317de59de48427e6f406f1fa2
 2018-08-03 21:04:06 +00:00
Android Build Merger (Role)
c056ac3011 [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaff5 
Change-Id: I8b74b9105db55d8b8cdb3f7bc7b8b42ee9998de8
 2018-08-03 21:04:04 +00:00
Doris Ling
c624deaff5 DO NOT MERGE Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-03 14:03:37 -07:00
Android Build Merger (Role)
3672a1fe7f [automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b 
Change-Id: Ia238fa6c7245d14b40c8abd4b08e4d591f776ece
 2018-08-03 01:00:48 +00:00
Doris Ling
94ea2dad5b DO NOT MERGE Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- set display search menu to false
- disallow update to display the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-02 18:00:29 -07:00
Doris Ling
770f4abf9d Disable changing lock when device is not provisioned. 
When the device is not yet provisioned and settings is launched:
- disable the entry point for changing device lock
- remove the search panel from settings home page
- remove the search menu

Bug: 110034419
Test: make RunSettingsRoboTests
Change-Id: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
Merged-In: Ieb7eb0e8699229ec0824ccc19d7b958ac44965a2
 2018-08-01 10:30:51 -07:00
Dario Freni
64e4c89ef6 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours am: 1e56e69a46 -s ours 
am: 1237373743  -s ours

Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e
 2018-07-24 04:06:25 -07:00
Dario Freni
1237373743 [automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239 -s ours 
am: 1e56e69a46  -s ours

Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9
 2018-07-24 04:02:45 -07:00
Dario Freni
1e56e69a46 [automerger skipped] Merge "Include NOTICE file in /product partition." 
am: aa2ec5f239  -s ours

Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406
 2018-07-24 03:58:08 -07:00
Treehugger Robot
aa2ec5f239 Merge "Include NOTICE file in /product partition." 2018-07-24 10:35:44 +00:00
Chalard Jean
92295f0953 Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 am: 9971303508 
am: 28a2b521cf

Change-Id: Iae1632372659849d2f61377d0b31d171c50491ab
 2018-07-20 12:33:56 -07:00
Chalard Jean
28a2b521cf Merge "Use the SSID of the network in the no internet dialog" am: 692f989b98 
am: 9971303508

Change-Id: Ie1eecd52e31477bf7cac2fbe542f34be308ec5b6
 2018-07-20 12:29:46 -07:00
Chalard Jean
9971303508 Merge "Use the SSID of the network in the no internet dialog" 
am: 692f989b98

Change-Id: I6921cab3a99a3b4e2ad5919acb1e01f814d26289
 2018-07-20 12:25:39 -07:00
Treehugger Robot
692f989b98 Merge "Use the SSID of the network in the no internet dialog" 2018-07-20 18:57:09 +00:00
Bill Yi
9551717c69 [automerger skipped] Import translations. DO NOT MERGE 
am: 0a8de9d763  -s ours

Change-Id: Ic192d76bf26a37373d18944f459bcacae754c174
 2018-07-20 11:33:55 -07:00
Xin Li
9652d9ec5b Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master 
am: e8858cc954

Change-Id: Ide9e745efe8952ac27fb9fb79053557aa6a1caef
 2018-07-19 23:45:48 -07:00
Bill Yi
0a8de9d763 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I26fa1f1f72571d0541556649bf104446c9522830
 2018-07-19 19:35:10 -07:00
Xin Li
e8858cc954 Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master 
Bug: 111615259
Change-Id: I0bbc44c97afd0ed6ff7799e866d4b36beee6c3be
 2018-07-19 13:50:34 -07:00
Brad Ebinger
aca1e304bd Merge "IMS: Use the slot based ImsManager factory reset API." am: 9e4ff6fca6 
am: 15ca33865c

Change-Id: I5fcdcb5b74a828d4377d2bc4e8e567f61ff9a899
 2018-07-16 13:55:25 -07:00
Brad Ebinger
15ca33865c Merge "IMS: Use the slot based ImsManager factory reset API." 
am: 9e4ff6fca6

Change-Id: I42b0a06ed5707475d105646233ac49958de29d75
 2018-07-16 13:32:55 -07:00
Brad Ebinger
9e4ff6fca6 Merge "IMS: Use the slot based ImsManager factory reset API." 2018-07-16 19:57:31 +00:00
Doris Ling
ca9617ac6b [automerger skipped] DO NOT MERGE Fix summary text for advanced button. 
am: 20e7c9d0ba  -s ours

Change-Id: I357656196bb6d24404aa797f380e1935264c1ac6
 2018-07-16 11:46:54 -07:00
Doris Ling
20e7c9d0ba DO NOT MERGE Fix summary text for advanced button. 
- the resource for the summary text is in the support library. However,
the prebuilt version in the build does not contain the latest change for
the summary text. Add the overlay for the summary resource here with the
updated translation to remove the redundant summary prefix in the
advanced button.

Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94
Fixes: 111195268
Test: manual
 2018-07-13 12:32:00 -07:00
Hall Liu
f9b76dfda1 Fix usage of SubscriptionInfo ctor 
am: f0072b7345

Change-Id: I0ec1335abfef8fc30c638636e3bb1ac24a221743
 2018-07-13 11:27:19 -07:00