Commit Graph

5228 Commits

Author SHA1 Message Date
Emilian Peev
44c7447466 Merge "Settings: Add laser sensor preference" into oc-mr1-dev am: 22eb007eea
am: 11179290a2

Change-Id: I0575553117ca62c027a82aa69ecc0c1865f6c762
2017-09-13 09:52:30 +00:00
Emilian Peev
11179290a2 Merge "Settings: Add laser sensor preference" into oc-mr1-dev
am: 22eb007eea

Change-Id: I34ab89bd2a175aa77a78a9a46aea75f148bab284
2017-09-13 08:40:10 +00:00
TreeHugger Robot
22eb007eea Merge "Settings: Add laser sensor preference" into oc-mr1-dev 2017-09-13 07:19:35 +00:00
Roozbeh Pournader
4de9df2943 Define Utils.formatRelativeTime() and use it
Previously, relative times were formatted using formatElapsedTime()
(appending translations of "ago" to them), sometimes resulting in
grammatically hard-to-understand or unnatural localizations. Now we
use ICU's RelativeDateTimeFormatter, which uses grammatically correct
and natural localizations from CLDR data.

Bug: 64507689
Bug: 64605781
Bug: 64556849
Bug: 64550172
Test: make -j RunSettingsRoboTests
Change-Id: Ia2d098b190ab99e7748ef6f03b919f5c6174ba7d
2017-09-12 20:48:00 +00:00
TreeHugger Robot
a26b07292d Merge "Adding switch for Forced App Standby" 2017-09-11 22:48:35 +00:00
Suprabh Shukla
4c64777b2a Adding switch for Forced App Standby
Reusing the 'Background activity' switch found in App Info. The switch
now needs to be shown for all apps and will toggle another app op
RUN_ANY_IN_BACKGROUND which controls whether jobs or alarms are run for
background apps.
Also fixed handling of multiple packages with shared uid. The controller
was picking the first package for uid but the order of packages can
change on a reboot which would cause wrong app ops settings across
packages of the same uid.

Test: make -j32 RunSettingsRoboTests

Bug: 65176793
Change-Id: I2a9b96bc02730776172c3ae317cb7f7f890bec30
2017-09-11 14:05:26 -07:00
Maurice Lam
a2f0fe91fd Merge "Fix sizing of pattern view" into oc-mr1-dev am: adef5b23e0
am: 4f61cfb967

Change-Id: I84059c89eda774c833c710166a1778bd36c6ff98
2017-09-11 20:17:18 +00:00
Maurice Lam
4f61cfb967 Merge "Fix sizing of pattern view" into oc-mr1-dev
am: adef5b23e0

Change-Id: I63928a5e53bf15b30d50f28fa9c4518503d005d7
2017-09-11 20:09:55 +00:00
Maurice Lam
7efcc35d85 Fix sizing of pattern view
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)

Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
2017-09-11 20:07:17 +00:00
debesay guadad
5b1651b3bb Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.

Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Merged-In: I6c452c512f03cf41704b91331e44141ed3050cf9
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-07 23:24:53 +00:00
Emilian Peev
6530b21cc5 Settings: Add laser sensor preference
Add a switch for enabling/disabling the laser sensor within
developer options.

Test: Manual using setting app, RunSettingsRoboTests
Bug: 64423712
Change-Id: I89a32dfa062fc62c4be096d2e026a32ce9b784ca
2017-09-07 08:54:58 +01:00
debesay guadad
b7a11feaa2 Add ims registration status
Display "IMS registration state" in Status menu. Introduce carrier
config to enable/disable the feature for customization. Since some
carriers require, this feature is necessary.

Test: manual Checked "IMS registration state" in Status menu
Bug: 28806101
Change-Id: I6c452c512f03cf41704b91331e44141ed3050cf9
2017-09-06 16:40:19 +00:00
Julia Reynolds
0e497230d9 Merge "Add settings page for notification channel groups" 2017-09-01 12:49:39 +00:00
Alison Cichowlas
3e5c6f718a Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev am: 49d25a0506
am: 4010eb294f

Change-Id: Iaa85e2d06431bd92886aafc8b94b36c20de46eef
2017-08-31 20:23:27 +00:00
Alison Cichowlas
4010eb294f Merge "Legacy channels say "allow sound" instead of "let the app decide". We had this string already translated from use in previous ux revs." into oc-mr1-dev
am: 49d25a0506

Change-Id: I3cd8b74fd35dbbdb73512a15f368a527119a9c20
2017-08-31 20:10:19 +00:00
Julia Reynolds
0c3f4bce57 Add settings page for notification channel groups
Bug: 63927402
Test: tests/unit/src/com/android/settings/notification/.*
Change-Id: Iebf7d8ba54f0cf5801a42f3161354d3cc5e5c848
2017-08-31 11:02:36 -04:00
TreeHugger Robot
69ad36d628 Merge "Modify notification string." 2017-08-29 17:59:32 +00:00
yuemingw
6b6d9fd979 Modify notification string.
Bug: 30432840
Test: Reproduced the problem by clicking 'Install from SD card' and the
new notification string appears instead of the old one.

Change-Id: I38a6fc6212aa283f8a899c28db81d8dae4245396
2017-08-29 14:06:31 +01:00
Maurice Lam
be1bc679c2 Fix typo in fingerprint string
Test: Manual
Bug: 65017285
Change-Id: I3664cc4b888c4c573b439f06f1ef9983d0470674
2017-08-24 19:40:30 +00:00
Alison Cichowlas
c3570914f6 Legacy channels say "allow sound" instead of "let the app decide".
We had this string already translated from use in previous ux revs.

Change-Id: I91a9ce001a0d875c0ae12643e6b386328e9cd8de
Fixes: 62873496
Test: String change, manually verified
2017-08-24 15:02:21 -04:00
Tony Mak
35efb10206 Merge "A separate entry for work profile CA cert" into oc-mr1-dev am: e040ef4a39
am: 237e49a7c9

Change-Id: I2b90fdcd5a6c88600077a0b09e693b006bf53177
2017-08-22 18:24:05 +00:00
Tony Mak
237e49a7c9 Merge "A separate entry for work profile CA cert" into oc-mr1-dev
am: e040ef4a39

Change-Id: I0774c8e5ebf959b5f6fb759566815bde966c0dfd
2017-08-22 18:21:35 +00:00
Tony Mak
c74bbcd3b2 A separate entry for work profile CA cert
We mixed both primary and work profile CA certs into single entry
previously which is not aligned with the CTS requirement.
Separate them from now.

Test: m -j RoboSettingsTest
Test: Run related manual test in CtsVerifier

Bug: 64567417

Change-Id: Iaff2d9f25ef15b96c11727e7075bdae8e90ec8ce
2017-08-22 18:24:30 +01:00
Maurice Lam
6c108ca693 Merge "Use default primary color for choose lock screens" into oc-mr1-dev am: 595627c630
am: 4db65eab00

Change-Id: I0d101f0c14572be3f8885e4a02dcb0119b4059ed
2017-08-16 22:10:01 +00:00
Fan Zhang
0654a22578 Merge "Stub out feature flag UI" 2017-08-16 20:27:14 +00:00
Maurice Lam
4db65eab00 Merge "Use default primary color for choose lock screens" into oc-mr1-dev
am: 595627c630

Change-Id: I09fc05b21e993352b4e6402032ca636ae18535e4
2017-08-16 18:30:22 +00:00
Maurice Lam
2c43d273b8 Merge "Update strings for screen lock setup" 2017-08-16 17:40:52 +00:00
Maurice Lam
e9a6e8f1e5 Use default primary color for choose lock screens
Make the settings screens that inherit from SuwThemeGlif use the
default blue primary color.

Test: Manual
Bug: 63143321
Change-Id: I07026139a5e0562c192ec1ca9304d5cd3647d5b0
2017-08-15 19:30:14 -07:00
Fan Zhang
75cd1d2010 Stub out feature flag UI
Bug: 36222960
Test: make -j40 RunSettingsRoboTests
Change-Id: Id2483d39018b2d93868f4ef7032124795ea91a53
2017-08-15 17:42:58 -07:00
Jesse Evans
51a13df33a Merge "Change strings from Instant app account to setting" into oc-mr1-dev am: 858ea46a3a
am: eee0e82fba

Change-Id: I996ed8caf0581cc3f273423b7d8d3989235e2f4e
2017-08-15 02:43:00 +00:00
Jesse Evans
eee0e82fba Merge "Change strings from Instant app account to setting" into oc-mr1-dev
am: 858ea46a3a

Change-Id: I22fb4b6d3ee5456a591f8dfa8f78d9f6d6da82dd
2017-08-15 01:37:07 +00:00
Maurice Lam
841288144c Update strings for screen lock setup
Manual cherry pick of 3eb4c8333e

Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-14 22:45:30 +00:00
Jesse Evans
804b0daf49 Change strings from Instant app account to setting
Test: existing tests
Bug: 63762769
Change-Id: I5499f76b9f8b5f513813c4ee09a4fb00c96c3fd4
2017-08-11 18:12:42 -07:00
Maurice Lam
a773403cd2 Update strings for screen lock setup
am: 3eb4c8333e

Change-Id: If48e98edbdc3eb7266ca951e23994942f31c2ef4
2017-08-12 00:22:14 +00:00
Maurice Lam
3eb4c8333e Update strings for screen lock setup
Test: Manual, existing tests pass
Bug: 64084524
Change-Id: Iff4b004aaf504ae3d574428e41bf91fd46a66f30
2017-08-11 13:12:20 -07:00
Ajay Nadathur
2c2d41f8e9 Merge "Update strings for skip fingerprint setup" into oc-mr1-dev am: 719d80e6e0
am: aec29ee4be

Change-Id: I66480f242ed99d3f6488b2c832b0b2745e7432e8
2017-08-11 17:25:31 +00:00
Ajay Nadathur
aec29ee4be Merge "Update strings for skip fingerprint setup" into oc-mr1-dev
am: 719d80e6e0

Change-Id: I844147fa567fd168dbf14effb746d96aee12ad3a
2017-08-11 17:21:24 +00:00
Ajay Nadathur
58c2da2d9e Update strings for skip fingerprint setup
bug: 64092225
Test: Manually tested and verified updated strings used
Change-Id: I813f72abb8cb9fd2ba9ec952c0926ecd2f670ed0
2017-08-11 00:42:30 +00:00
Joachim Sauer
8a739a4bd1 Merge "Implement auto 12/24h setting toggle." 2017-08-10 16:36:47 +00:00
Joachim Sauer
95beae0089 Implement auto 12/24h setting toggle.
This implements an explicit toggle to enable/disable automatic 12h/24h
time formatting detection based on the current locale.

Previously automatic detection was the norm on a freshly wiped device,
but could never be re-enabled once either 12h or 24h format was
configured.

Bug: 32761619
Test: m RunSettingsRoboTests
Change-Id: Idbbb8f79fccec95e33bf2f12767d5736e1118fa7
2017-08-10 13:32:17 +01:00
Fan Zhang
17cfd9f500 Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev am: 0dc85bcc1e
am: 1e61f91d7b

Change-Id: I5610152c59889196124ff728e2607de764047e08
2017-08-10 02:31:39 +00:00
Ajay Nadathur
3253b7ee7c Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev am: 0ed0319005
am: b9c3eb954a

Change-Id: Ie7d1d6bd37274ac70c87fc6b8dca5f3118a64a64
2017-08-10 02:20:25 +00:00
Fan Zhang
1e61f91d7b Merge "Update icon and string for new device intro suggestion" into oc-mr1-dev
am: 0dc85bcc1e

Change-Id: I3942d07dd5c0acd5640ad50b7311ba15177f5a6d
2017-08-10 00:44:59 +00:00
TreeHugger Robot
d0b09f7868 Merge "Remove code for old wifi tether feature" 2017-08-10 00:08:03 +00:00
Fan Zhang
3fc194017d Update icon and string for new device intro suggestion
Change-Id: If1cca8e54e277d0ad58b76318df58842f2bec886
Fixes: 64342027
Test: visual
2017-08-09 13:57:37 -07:00
Ajay Nadathur
b9c3eb954a Merge "Show confirmation dialog when user tries to skip fingerprint" into oc-mr1-dev
am: 0ed0319005

Change-Id: I37fdea03ab0193a6c42da584166c30ce6ee7b3c7
2017-08-09 20:27:45 +00:00
Ajay Nadathur
bf3a135170 Show confirmation dialog when user tries to skip fingerprint
- After the user finished adding lock screen, if the user tries to skip
fingerprint setup, show a confirmation dialog

bug: 64092225
Test: Manually tested; robolectric tests also added
Change-Id: Iba5088a9db93153988942cf78f11077f427e50cb
2017-08-09 17:51:50 +00:00
Adrian Roos
d3c5da9e18 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev am: a147d4a616
am: 1d192addc6

Change-Id: I1f349fbaad0c6807f1e3dccf30fe47b6c48d3eec
2017-08-09 14:18:21 +00:00
Adrian Roos
1d192addc6 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am: a147d4a616

Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
2017-08-09 13:55:00 +00:00
TreeHugger Robot
a147d4a616 Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev 2017-08-09 13:36:40 +00:00