PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,235 Commits 1 Branch 0 Tags
9f74ef8d4b0750573b91c901b69d2aa852f57c02
Commit Graph

10612 Commits

Author SHA1 Message Date
Fan Zhang
48aab452cb UI updates for support tab. 
Fixes: 29999181
Fixes: 29397123

- Reduce support tile min height to 48dp.
- Add a 8dp spacer between escalation card and first support tile.
- Show different off-hour support escalation title when support hour is
  always avaiable.

Change-Id: I4dacf2b375734c4819b9b19b68fc84faf083c0d4
 2016-07-08 10:26:29 -07:00
Makoto Onuki
0651701930 Restore "reset ShortcutManager rate limiting" dev option 
Bug 30031093

Change-Id: I28cbf56e61937b15eb5806823f40e43d6bac4e72
 2016-07-08 09:37:48 -07:00
Fan Zhang
c74925b5dd Merge \\"Wrap bluetooth edit content in a scrollview.\\" into nyc-mr1-dev am: 96bc7b5d03 
am: 6e5de35ba4

Change-Id: I434ac510f8637285524e579a7bf1ce3a9592bf3f
 2016-07-07 21:10:43 +00:00
Fan Zhang
6e5de35ba4 Merge \"Wrap bluetooth edit content in a scrollview.\" into nyc-mr1-dev 
am: 96bc7b5d03

Change-Id: I70717e53ebdc47a658092743e31dc8db0a70d811
 2016-07-07 21:01:56 +00:00
Fan Zhang
96bc7b5d03 Merge "Wrap bluetooth edit content in a scrollview." into nyc-mr1-dev 2016-07-07 20:30:00 +00:00
Doris Ling
27c6820fb9 Merge \\"Add padding for the animation in the gestures settings.\\" into nyc-mr1-dev am: 1b41dd7f8c 
am: aca1f81bad

Change-Id: I34328c7cebe72358037c0897c1bcefd9788ece46
 2016-07-07 17:14:51 +00:00
Doris Ling
aca1f81bad Merge \"Add padding for the animation in the gestures settings.\" into nyc-mr1-dev 
am: 1b41dd7f8c

Change-Id: I047b71720315408c432b1bd4d430b1724ea48536
 2016-07-07 17:11:12 +00:00
Doris Ling
1b41dd7f8c Merge "Add padding for the animation in the gestures settings." into nyc-mr1-dev 2016-07-07 16:58:40 +00:00
TreeHugger Robot
9298f8c604 Merge "Announce user credential deletions" 2016-07-07 16:54:31 +00:00
Fan Zhang
fb4c548b78 Fix strings for support tab. am: 4178710f3d 
am: caf4498597

Change-Id: Id1269070341ab353e981a640aaadecf9ee58aa34
 2016-07-07 15:40:16 +00:00
Fan Zhang
caf4498597 Fix strings for support tab. 
am: 4178710f3d

Change-Id: Iaf5c0945180fab00986827f03dd1bdf9b4c224eb
 2016-07-07 15:37:23 +00:00
Fan Zhang
4178710f3d Fix strings for support tab. 
Bug: 29105266

- Fix typos in string and comments
- Use 2 different strings for off-hour and off-line cases.

Change-Id: I63859605ff7185d5f8cc66fd31b56f1d09ed11aa
 2016-07-07 08:27:25 -07:00
Fan Zhang
8924756a2b Wrap bluetooth edit content in a scrollview. 
Bug: 28914094

In split screen the dialog content is too tall to fit in viewport. Wrap
content in a scrollview so user can scroll vertically for different
options, and have a visual indication that content is scrollable.

Change-Id: Ia304dca6747cec6f31e86ccf89003ef6890e0640
 2016-07-06 18:18:50 -07:00
Doris Ling
2ed8651f1f Merge \\"Fix layout transition from Display->Ambient Display to Gestures\\" into nyc-mr1-dev am: 3633058181 
am: e4b305a0f0

Change-Id: Iff8d7ff83a301a18482c008f912b0a660a314bc0
 2016-07-06 22:29:27 +00:00
Doris Ling
e4b305a0f0 Merge \"Fix layout transition from Display->Ambient Display to Gestures\" into nyc-mr1-dev 
am: 3633058181

Change-Id: I75ed59bcdb3cf2382b8bc6fb9eb99f280fc1df72
 2016-07-06 22:20:07 +00:00
Doris Ling
3633058181 Merge "Fix layout transition from Display->Ambient Display to Gestures" into nyc-mr1-dev 2016-07-06 22:08:08 +00:00
Doris Ling
41d06570a4 Add padding for the animation in the gestures settings. 
Add padding around the animation video in landscape mode to make it look
more proportional.

Bug: 29792743
Change-Id: I52cfcecd680a118741d8ced18afd9fc811a33d94
 2016-07-06 14:59:33 -07:00
Fan Zhang
75d38e4b43 resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp 
am: 4a1d2c793d

Change-Id: If3e3020d44c4b69aeaa36e3d58ad73f12a6b01bd
 2016-07-06 20:59:51 +00:00
Fan Zhang
4a1d2c793d resolve merge conflicts of 9968f7a to nyc-mr1-dev-plus-aosp 
Change-Id: Ic9a3884cc8bd08eea22d7d83660419ac84555e83
 2016-07-06 13:28:19 -07:00
Doris Ling
9a3cf7725b Fix layout transition from Display->Ambient Display to Gestures 
1. Add handling in Gestures settings to scroll to the corresponding
preference when launching from Display->Ambient Display
2. Remove the bitmap creation for the video preview image
3. Use a custom aspect ration framee layout to hold the animation
instead to avoid resizing of the animation view.

Bug: 29795707
Change-Id: I67209ba2508a93da4fc46ff20986309dbe5a83d5
 2016-07-06 13:21:08 -07:00
TreeHugger Robot
9968f7a752 Merge "Show 'up arrow' in About phone->Status menu." into nyc-mr1-dev 2016-07-06 20:09:44 +00:00
Maurice Lam
584a11ec4a Update button styles for fingerprint 
Use button styles instead of list style because of UX spec change.

Bug: 29421687
Change-Id: Icf178c881c2325b6183de8667a5657b3d2088f72
 2016-07-06 18:15:06 +00:00
Bill Yi
a937ff573e Import translations. DO NOT MERGE 
Change-Id: I3df812343b69d4e10d3fa2876913a4c7f5698c89
Auto-generated-cl: translation import
 2016-07-05 19:52:46 -07:00
Bill Yi
246bcb7b41 Import translations. DO NOT MERGE 
Change-Id: I9292d04c0981f742b5a71403c58509f1fd4e4d4c
Auto-generated-cl: translation import
 2016-07-05 19:05:09 -07:00
Fan Zhang
47e2b976a0 Show 'up arrow' in About phone->Status menu. 
Bug: 27970152

Status should be a Submenu to have up arrow. Also cleaned up
AndroidManifest for this fragment as it doesn't need to run in a
separate process.

Change-Id: I0610314b3baa3d5f1f70d255b4657c805c534373
 2016-07-01 16:51:49 -07:00
Doris Ling
57949a9784 Merge \\"Update Backup & reset settings to launch the configured activity.\\" into nyc-mr1-dev am: f230f4f9ad 
am: 0fbf0fd198

Change-Id: I8ff4ca45d2985cb5c18f0664e95747ce57515118
 2016-07-01 20:38:41 +00:00
Doris Ling
0fbf0fd198 Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev 
am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269
 2016-07-01 20:33:11 +00:00
Doris Ling
f230f4f9ad Merge "Update Backup & reset settings to launch the configured activity." into nyc-mr1-dev 2016-07-01 20:15:59 +00:00
Doris Ling
26bf003df9 Update Backup & reset settings to launch the configured activity. 
Check for configured backup settings activity to be used for
Settings->Backup & reset.

Bug: 28942163
Change-Id: I8b937fde5b400afdb81463c9c278b3e3ad42688b
 2016-07-01 11:49:03 -07:00
Fan Zhang
bfed632c6e Merge \\"Update escalation cards layout and data binding.\\" into nyc-mr1-dev am: eef9dbcdb9 
am: 0e2e738400

Change-Id: Iff273a832ffa46deda85223a0b627cbc5e015caf
 2016-07-01 18:36:19 +00:00
Fan Zhang
0e2e738400 Merge \"Update escalation cards layout and data binding.\" into nyc-mr1-dev 
am: eef9dbcdb9

Change-Id: I1d5d80d7c60b72f0cb4d8d9eb91679000f278f6d
 2016-07-01 18:31:18 +00:00
Fan Zhang
eef9dbcdb9 Merge "Update escalation cards layout and data binding." into nyc-mr1-dev 2016-07-01 18:17:38 +00:00
Daniel Nishi
53027997ff Merge \\"Update strings to match the latest mocks.\\" into nyc-mr1-dev am: 7a23b48266 
am: b582e1c7de

Change-Id: Ib45c94ed413c4e096c69c18c2125fbb67b22f2f2
 2016-07-01 00:35:51 +00:00
Daniel Nishi
b582e1c7de Merge \"Update strings to match the latest mocks.\" into nyc-mr1-dev 
am: 7a23b48266

Change-Id: Icf61ff61f5110c6455c88da9b62026b1b9955484
 2016-07-01 00:02:10 +00:00
Daniel Nishi
7a23b48266 Merge "Update strings to match the latest mocks." into nyc-mr1-dev 2016-06-30 23:50:47 +00:00
Jorim Jaggi
93779ae3c6 Merge \\"Fix ugly flash between boot animation and setup wizard (1/2)\\" into nyc-mr1-dev am: 9711521e3c 
am: 92f03e58f3

Change-Id: Ibc2962f22482e7c4d239c64472a24773359c9971
 2016-06-30 23:15:23 +00:00
Jorim Jaggi
92f03e58f3 Merge \"Fix ugly flash between boot animation and setup wizard (1/2)\" into nyc-mr1-dev 
am: 9711521e3c

Change-Id: Ibe1410573df0d661ae62e45ff798bfbcc0079a1a
 2016-06-30 23:10:38 +00:00
TreeHugger Robot
9711521e3c Merge "Fix ugly flash between boot animation and setup wizard (1/2)" into nyc-mr1-dev 2016-06-30 22:58:09 +00:00
Daniel Nishi
1fde957be1 Merge \\"Add text to the Manage Settings page to show freed storage.\\" into nyc-mr1-dev am: 8c8791a807 
am: 55f2a8a8b5

Change-Id: I7b25f572d4e10da89b29dcc339e695637f716958
 2016-06-30 21:31:57 +00:00
Daniel Nishi
55f2a8a8b5 Merge \"Add text to the Manage Settings page to show freed storage.\" into nyc-mr1-dev 
am: 8c8791a807

Change-Id: I4b09319cf771325d1bbb11214733a45e7b26a3b5
 2016-06-30 21:25:10 +00:00
Daniel Nishi
8c8791a807 Merge "Add text to the Manage Settings page to show freed storage." into nyc-mr1-dev 2016-06-30 21:17:19 +00:00
Daniel Nishi
9a761788b0 Update strings to match the latest mocks. 
Bug: 29877906
Change-Id: I96338cb42f8e53b0d642e1ad13064fa86cbdc5ba
 2016-06-30 14:05:22 -07:00
Fan Zhang
016bd60491 Update escalation cards layout and data binding. 
Bug: 29397123

- Updated the UI for support escalation cards so different state have
  the same height and text/button shows up at roughly same place.
- Split data model for escalation cards from SupportData. The data and
  UI between escalation cards and support tiles are different enough
  that it no longer makes sense to share the same data object.

Change-Id: I328cc33961b9638e5e5fc2cad3ebf443991f4d0c
 2016-06-30 13:57:22 -07:00
Doris Ling
931c0f92fe Merge \\"Add help url for gestures settings.\\" into nyc-mr1-dev am: 0a7300b8d1 
am: 055c48b751

Change-Id: I37d6d591aa8da8689e5721dd97a2fc7d22e645d7
 2016-06-30 20:09:33 +00:00
Doris Ling
055c48b751 Merge \"Add help url for gestures settings.\" into nyc-mr1-dev 
am: 0a7300b8d1

Change-Id: Ia267524166ed0c9ffb3f517a0c81119d45e7a57b
 2016-06-30 20:06:00 +00:00
Doris Ling
0a7300b8d1 Merge "Add help url for gestures settings." into nyc-mr1-dev 2016-06-30 19:59:21 +00:00
Doris Ling
ec208fdb8f Add help url for gestures settings. 
Override getHelpResource() in GestureSettings and added corresponding
resource string for the help url.

Bug: 29792538
Change-Id: I2f2d93fc25b63266504bd13b954fefa5692e9ddf
 2016-06-30 10:53:07 -07:00
Andrew Sapperstein
d2e91f05b1 Merge \\"Fix some bluetooth theming issues.\\" into nyc-mr1-dev am: 6e1336bff1 
am: 987c5d07ba

Change-Id: Ifb9ede98982d50a17d0ebeec8f0110226b153dcb
 2016-06-30 17:41:44 +00:00
Andrew Sapperstein
987c5d07ba Merge \"Fix some bluetooth theming issues.\" into nyc-mr1-dev 
am: 6e1336bff1

Change-Id: I8d786d231ab86e18103b4df457ab7a1801df9a28
 2016-06-30 17:32:29 +00:00
Andrew Sapperstein
6e1336bff1 Merge "Fix some bluetooth theming issues." into nyc-mr1-dev 2016-06-30 17:17:19 +00:00