PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,222 Commits 1 Branch 0 Tags
6315a61bbf122f59e1c84eb3d451a3ae6844a33c
Commit Graph

27222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7927becdbe Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 
am: 88e71ef  -s ours

* commit '88e71ef15142712d6c5c4d6871afee1f88ce428e':
  Import translations. DO NOT MERGE

Change-Id: I93ae38563d3303a2eab5957f8dbfd0740f580a92
 2016-04-27 20:02:50 +00:00
Bill Yi
eeee5312a2 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: eb50d20  -s ours

* commit 'eb50d20504dc31e562f6687298de3aca7d011896':
  Import translations. DO NOT MERGE

Change-Id: Ia29296e9801f45c2cfb70ac151d257078bc90253
 2016-04-27 19:56:17 +00:00
Bill Yi
1e21b15db1 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: eb50d20  -s ours

* commit 'eb50d20504dc31e562f6687298de3aca7d011896':
  Import translations. DO NOT MERGE

Change-Id: Ic9e597c9fe422865b44113e31f0e49567f0f37e4
 2016-04-27 19:56:10 +00:00
Bill Yi
88e71ef151 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-04-27 19:44:32 +00:00
Bill Yi
eb50d20504 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-27 19:44:13 +00:00
Felipe Leme
616ff3e6a4 Implemented IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS. 
BUG: 26820898
Change-Id: I83613ce54e13470dafd6420eec0af252e5e39429
 2016-04-27 12:33:57 -07:00
Android Build Merger (Role)
33ad219176 Merge "Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 am: 3cb641e" into nyc-mr1-dev-plus-aosp 2016-04-27 19:31:38 +00:00
Jason Monk
c8ab34c5e4 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 
am: 03fb024

* commit '03fb0244d58d1d932570c1eacdce498d8146e68f':
  Fix Settings Condition expand button a11y label

Change-Id: Ia0d8bb962071b75f5d78912a07e64d012caff9ce
 2016-04-27 19:31:26 +00:00
Jason Monk
da211d2c79 Merge "Fix Settings Condition expand button a11y label" into nyc-dev am: 51b1e05 
am: 3cb641e

* commit '3cb641e25d42c1a9396735821337702460dd983c':
  Fix Settings Condition expand button a11y label

Change-Id: Id8cba8754c8fb7b4be7b662ed3b8840ca899436c
 2016-04-27 19:31:22 +00:00
Clara Bayarri
03fb0244d5 Merge "Fix Settings Condition expand button a11y label" into nyc-dev 
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I3ce32065454d5b5e0bf58954e03ff88b8e205a1a
 2016-04-27 19:26:54 +00:00
Clara Bayarri
3cb641e25d Merge "Fix Settings Condition expand button a11y label" into nyc-dev 
am: 51b1e05

* commit '51b1e0515d64adf3e330437960546465c0f4c7d3':
  Fix Settings Condition expand button a11y label

Change-Id: I5891f817f4f484c79968c9ea8300596b5c1652d1
 2016-04-27 19:26:52 +00:00
Fan Zhang
2ddde4a928 Monitor connectivity change and display offline promo. 
Bug: 28141203
Change-Id: I2af7cc3071d835092fba961ff59189f1fb295063
 2016-04-27 12:21:46 -07:00
Jason Monk
51b1e0515d Merge "Fix Settings Condition expand button a11y label" into nyc-dev 2016-04-27 19:15:59 +00:00
Julia Reynolds
18d0386703 Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38 
am: 481a277

* commit '481a277eb64ec9598afe83e19503995854d3d802':

Change-Id: I1001316b68231f8e4b1a82337edc3d2962fea213
 2016-04-27 18:46:51 +00:00
Julia Reynolds
7cf677975c Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev am: ae35c38 
am: 8f2fd11

* commit '8f2fd1106c48588e9138714ce83da1d4f3656b26':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If4f1b16655504bfd407af415bdd27fec4d36ac6f
 2016-04-27 18:42:02 +00:00
Julia Reynolds
481a277eb6 Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev 
am: ae35c38

* commit 'ae35c38fe7ee475a1c4c5a0386184ef7d682359b':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: I12e4212fc2a7df04be34a1c7baa81303b93ab06e
 2016-04-27 18:37:52 +00:00
Julia Reynolds
8f2fd1106c Merge "Show \'on the lockscreen\' setting in more contexts." into nyc-dev 
am: ae35c38

* commit 'ae35c38fe7ee475a1c4c5a0386184ef7d682359b':
  Show 'on the lockscreen' setting in more contexts.

Change-Id: If68301e5aea27bb82d5c1fa5ebae0833bcdeab02
 2016-04-27 18:37:44 +00:00
Julia Reynolds
ae35c38fe7 Merge "Show 'on the lockscreen' setting in more contexts." into nyc-dev 2016-04-27 18:27:04 +00:00
Fan Zhang
5fee9ade46 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev 
am: 562f632

* commit '562f6322e596b0e31cc295abd9ae75ce1a065082':
  Add c2c and chat support when there is eligible account.

Change-Id: Ieb84c45e92a52f2352e069adcac70d0b5344c2f8
 2016-04-27 17:11:13 +00:00
Fan Zhang
562f6322e5 Merge "Add c2c and chat support when there is eligible account." into nyc-mr1-dev 2016-04-27 16:52:39 +00:00
Julia Reynolds
21fd269ea3 Show 'on the lockscreen' setting in more contexts. 
- For managed profile apps
- When 'auto' importance is on.

Bug: 28405255
Change-Id: Ia4c0bc6010f157cac18a828069bbcf54087fc663
 2016-04-27 12:46:43 -04:00
Fan Zhang
a9fa0059b2 Add c2c and chat support when there is eligible account. 
Bug: 28141203
Bug: 28316618
Bug: 28316343

- Replaced hardcoded fragment layout with a RecyclerView. The old layout
  was essentially building a list manually.
- Tweaked layout to look better.
- Hide escalation cards when there is no account. Show cards when
  there is at least 1 account.
- Request an intent to start specified support type when card is
  clicked.
- Monitor account changes so we can hide/show escalation cards when
  add/remove account.

Change-Id: Ie48158b85ade1363a41817cc88b1193e0aef87ae
 2016-04-27 09:06:17 -07:00
Clara Bayarri
58440b2801 Fix Settings Condition expand button a11y label 
Bug: 27276008
Change-Id: Ie62ed8a73b300948f053b5d35f344bce3b63869a
 2016-04-27 16:54:22 +01:00
TreeHugger Robot
622140a825 Merge "Fixed context reference." into nyc-dev am: d76c723 
am: c491501

* commit 'c491501a82d5eb9a09e5be666a397559372319b9':

Change-Id: I1ca04332a1ae87c6fd02f544557b75d91df1985e
 2016-04-27 15:10:32 +00:00
TreeHugger Robot
6b780f93f8 Merge "Fixed context reference." into nyc-dev am: d76c723 
am: f989996

* commit 'f989996d438d988f44a438a5104bdadf78adf218':
  Fixed context reference.

Change-Id: I7d0ff710dd60892ae92d433106c403676830a4ef
 2016-04-27 15:06:27 +00:00
Felipe Leme
f989996d43 Merge "Fixed context reference." into nyc-dev 
am: d76c723

* commit 'd76c723ebcf857661e65ac4aba9c1699f7e24163':
  Fixed context reference.

Change-Id: I3c3aad0b862c1347171c75883b664b586aacd5ef
 2016-04-27 15:02:01 +00:00
Felipe Leme
c491501a82 Merge "Fixed context reference." into nyc-dev 
am: d76c723

* commit 'd76c723ebcf857661e65ac4aba9c1699f7e24163':
  Fixed context reference.

Change-Id: Ida3995915b81347ee200468efeb35c67fc9e3f48
 2016-04-27 15:02:00 +00:00
TreeHugger Robot
d76c723ebc Merge "Fixed context reference." into nyc-dev 2016-04-27 14:53:08 +00:00
Android Build Merger (Role)
ed1a8fe9bd Merge "Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb am: 74887c8" into nyc-mr1-dev-plus-aosp 2016-04-27 13:51:05 +00:00
Android Build Merger (Role)
6216894f9e Merge "Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe am: 0bc3442" into nyc-mr1-dev-plus-aosp 2016-04-27 13:51:01 +00:00
Abodunrinwa Toki
0f3e586070 Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb 
am: 74887c8

* commit '74887c883f483dabd32d74136bbfc13694524ea2':
  Make Settings dashboard items focusable.

Change-Id: Id13075d0a49b32c3d5ac40822d68510daaf0b411
 2016-04-27 13:50:46 +00:00
Clara Bayarri
ae1080e13e Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe 
am: 0bc3442

* commit '0bc3442d1fa51d15fe354a070818f46e9b301673':

Change-Id: I8a89f1a342915aeeab6000f1c37b61ae18f08050
 2016-04-27 13:50:45 +00:00
Abodunrinwa Toki
b8c0f8a789 Merge "Make Settings dashboard items focusable." into nyc-dev am: f7cd5bb 
am: 478988a

* commit '478988a7316c42dc76f8bf4f64674ce303b6ba26':
  Make Settings dashboard items focusable.

Change-Id: I8d0d4fb1fd6871f46e59e1d49cac8937b97a645f
 2016-04-27 13:50:43 +00:00
Abodunrinwa Toki
478988a731 Merge "Make Settings dashboard items focusable." into nyc-dev 
am: f7cd5bb

* commit 'f7cd5bb4da10363b1a839d617caa666d24f101c4':
  Make Settings dashboard items focusable.

Change-Id: If3e074c38ac0763daaef83e6b0846e10a3f38739
 2016-04-27 13:46:38 +00:00
Abodunrinwa Toki
74887c883f Merge "Make Settings dashboard items focusable." into nyc-dev 
am: f7cd5bb

* commit 'f7cd5bb4da10363b1a839d617caa666d24f101c4':
  Make Settings dashboard items focusable.

Change-Id: Ibecb9723c480e34c353f12779ba2f4c581dcfdc6
 2016-04-27 13:46:37 +00:00
Clara Bayarri
c3f838e83a Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev am: e5103fe 
am: 95efca5

* commit '95efca59700824194d32d51ca6fe00ad3ca8e6a6':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: Ia7c75ec3f76f16212ca9b92234e0587e19f739b1
 2016-04-27 13:46:37 +00:00
Clara Bayarri
0bc3442d1f Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev 
am: e5103fe

* commit 'e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: I60eb53abf8fe6657717272f3ffd26f279298aac0
 2016-04-27 13:41:48 +00:00
Clara Bayarri
95efca5970 Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev 
am: e5103fe

* commit 'e5103fe70400f2e4e93eddb7f6a70ba11e70c19d':
  Fix SIM cards option displayed in RYU & N9 WiFi Settings

Change-Id: I85379faeb5a701a0859bb7485774ff89f1ad4fca
 2016-04-27 13:41:48 +00:00
Abodunrinwa Toki
f7cd5bb4da Merge "Make Settings dashboard items focusable." into nyc-dev 2016-04-27 13:41:01 +00:00
Clara Bayarri
e5103fe704 Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev 2016-04-27 13:34:15 +00:00
Clara Bayarri
e64f89c23c Fix SIM cards option displayed in RYU & N9 WiFi Settings 
Same as previously with Developer Settings, the Settings main
activity uses PackageManager to disable options that shouldn't
show up. Since this has a delay, these options show up initially
and disappear after a refresh. Disabling them by default makes
them not show up at all for devices that won't have them, but in
exchange makes them not be visible until the first refresh for
devices that do have them.

A more complete fix would involve having a way to initially
not depend on PackageManager for option visibilities.

Bug: 28308433
Change-Id: I6f5c2151a45878fb6c69a9f9971c29ebe65d9d8a
 2016-04-27 12:33:56 +01:00
Bill Yi
df4bc602bd Import translations. DO NOT MERGE 
Change-Id: I7b54da2b860a462c273ca1e6975e4942012c7525
Auto-generated-cl: translation import
 2016-04-26 22:46:01 -07:00
Bill Yi
2cb624ded0 Import translations. DO NOT MERGE 
Change-Id: I4312c197fd1f3dbb02c0a68de07470924fb93369
Auto-generated-cl: translation import
 2016-04-26 22:34:25 -07:00
Maurice Lam
e9841efb18 Merge "GLIF theme for settings" into nyc-mr1-dev 
am: 203fbde

* commit '203fbde10d652c10349052d645cf40a76b9d4198':
  GLIF theme for settings

Change-Id: If1330a47f96fba74225e4f8fec8283537c3d5f19
 2016-04-27 01:20:18 +00:00
Maurice Lam
203fbde10d Merge "GLIF theme for settings" into nyc-mr1-dev 2016-04-27 01:10:44 +00:00
Maurice Lam
190ec1c14a GLIF theme for settings 
Update fingerprint and screen lock setup to GLIF theme.

- Screen lock setup while in SUW
- Fingerprint setup, in and out of SUW

Bug: 26427729
Change-Id: I1063d3b54bbeea72de38bcc246cff368bc65945e
 2016-04-26 17:20:31 -07:00
TreeHugger Robot
f8066f23de Merge "Remove -night qualified resources" into nyc-dev am: 3602edf 
am: c42a680

* commit 'c42a6808e8d5a06935f1a38045431ab99bf495a4':

Change-Id: I9b20eb73828fbf5584dcfef07b5c43aab9b1a067
 2016-04-26 18:53:56 +00:00
TreeHugger Robot
2e9b19ff74 Merge "Remove -night qualified resources" into nyc-dev am: 3602edf 
am: 8802d69

* commit '8802d693c7af6bbf5afed3951b207cbfeb1a0365':
  Remove -night qualified resources

Change-Id: I0b02eeb578905c70288387aa3b7da4a7b34d7d13
 2016-04-26 18:47:24 +00:00
Alan Viverette
c42a6808e8 Merge "Remove -night qualified resources" into nyc-dev 
am: 3602edf

* commit '3602edf29ef83dfe348bb16a14a5dccd8c61368e':
  Remove -night qualified resources

Change-Id: I951817d2375f9e6e2180bc7e6e06d04b5ec54e99
 2016-04-26 18:44:10 +00:00
Alan Viverette
8802d693c7 Merge "Remove -night qualified resources" into nyc-dev 
am: 3602edf

* commit '3602edf29ef83dfe348bb16a14a5dccd8c61368e':
  Remove -night qualified resources

Change-Id: Ifee7850fa18d436a7323685c1d94029c13a8d77e
 2016-04-26 18:44:05 +00:00