Tony Mak
c17d319f85
Merge "Hide redundant restrictions" into nyc-mr1-dev am: cd49847096 am: ff36f1784e
...
am: 5f36219b87
2016-08-03 09:54:24 +00:00
Tony Mak
53aded222c
Hide redundant restrictions am: 9ba765b875 am: 4de7f88830
...
am: 3578d8f18c
2016-08-03 09:54:23 +00:00
Tony Mak
5f36219b87
Merge "Hide redundant restrictions" into nyc-mr1-dev am: cd49847096
...
am: ff36f1784e
2016-08-03 09:38:58 +00:00
Tony Mak
3578d8f18c
Hide redundant restrictions am: 9ba765b875
...
am: 4de7f88830
2016-08-03 09:38:58 +00:00
Tony Mak
ff36f1784e
Merge "Hide redundant restrictions" into nyc-mr1-dev
...
am: cd49847096
2016-08-03 09:35:27 +00:00
Tony Mak
4de7f88830
Hide redundant restrictions
...
am: 9ba765b875
2016-08-03 09:35:27 +00:00
Tony Mak
cd49847096
Merge "Hide redundant restrictions" into nyc-mr1-dev
2016-08-03 09:28:25 +00:00
Jorim Jaggi
45b2c9d856
Merge "Update string for FallbackHome" into nyc-mr1-dev am: 787fb603b9 am: d09a45a689
...
am: 34ac13b754
2016-08-03 01:04:48 +00:00
Jorim Jaggi
c42dac79f4
Update string for FallbackHome am: 2d3a1cd8bd am: 626abf16f0
...
am: 17b5675952
2016-08-03 01:04:47 +00:00
Jorim Jaggi
34ac13b754
Merge "Update string for FallbackHome" into nyc-mr1-dev am: 787fb603b9
...
am: d09a45a689
2016-08-03 00:53:30 +00:00
Jorim Jaggi
17b5675952
Update string for FallbackHome am: 2d3a1cd8bd
...
am: 626abf16f0
2016-08-03 00:53:30 +00:00
Jorim Jaggi
d09a45a689
Merge "Update string for FallbackHome" into nyc-mr1-dev
...
am: 787fb603b9
2016-08-03 00:50:58 +00:00
Jorim Jaggi
626abf16f0
Update string for FallbackHome
...
am: 2d3a1cd8bd
2016-08-03 00:50:57 +00:00
TreeHugger Robot
787fb603b9
Merge "Update string for FallbackHome" into nyc-mr1-dev
2016-08-03 00:43:24 +00:00
ewol
90c4e5f9dc
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev am: e6c1439ee4
...
am: a200a93196
2016-08-02 22:51:33 +00:00
Erik Wolsheimer
a91c223657
Fix potential NPE in BluetoothPairingDialog#onDestroy am: 56c1b61e79
...
am: 116a68e633
2016-08-02 22:51:32 +00:00
Erik Wolsheimer
a200a93196
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev
...
am: e6c1439ee4
2016-08-02 22:32:23 +00:00
Erik Wolsheimer
116a68e633
Fix potential NPE in BluetoothPairingDialog#onDestroy
...
am: 56c1b61e79
2016-08-02 22:32:23 +00:00
ewol
e6c1439ee4
Merge "Fix potential NPE in BluetoothPairingDialog#onDestroy" into cw-f-dev
2016-08-02 22:29:35 +00:00
Jorim Jaggi
9e63415af6
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev am: 2b0bd66d5b am: 70cb9bea74
...
am: 2b97d4e087
2016-08-02 22:22:02 +00:00
Jorim Jaggi
bbf6e5e0c5
resolve merge conflicts of 4c839a5 to master
...
Change-Id: Ie02e2b015c03512615fa25a0f4f0e955fd6910be
2016-08-02 22:26:55 +02:00
Jorim Jaggi
2d3a1cd8bd
Update string for FallbackHome
...
Also add some margins in case the string is really long
Change-Id: I0b5246d51d670316c8578475aedac00f8c090e57
Fixes: 30213213
2016-08-02 22:19:42 +02:00
Meng Wang
7793bd41b7
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev am: 6490032550 am: f9224775a6
...
am: ced8b91c01
2016-08-02 19:44:13 +00:00
Meng Wang
ae45e82fa8
Hide sim card selection UI when only one sim presents am: dfba923468 am: ba61eb2d40
...
am: 11f5678daf
2016-08-02 19:44:13 +00:00
Jorim Jaggi
2b97d4e087
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev am: 2b0bd66d5b
...
am: 70cb9bea74
2016-08-02 19:32:46 +00:00
Jorim Jaggi
4c839a59b3
Show progress user unlocking is delayed am: 984079442f
...
am: 30ac0e837a
2016-08-02 19:32:46 +00:00
Jorim Jaggi
70cb9bea74
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev
...
am: 2b0bd66d5b
2016-08-02 19:30:09 +00:00
Meng Wang
ced8b91c01
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev am: 6490032550
...
am: f9224775a6
2016-08-02 19:30:09 +00:00
Meng Wang
11f5678daf
Hide sim card selection UI when only one sim presents am: dfba923468
...
am: ba61eb2d40
2016-08-02 19:30:09 +00:00
Jorim Jaggi
30ac0e837a
Show progress user unlocking is delayed
...
am: 984079442f
2016-08-02 19:30:09 +00:00
Meng Wang
f9224775a6
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
...
am: 6490032550
2016-08-02 19:27:40 +00:00
Meng Wang
ba61eb2d40
Hide sim card selection UI when only one sim presents
...
am: dfba923468
2016-08-02 19:27:40 +00:00
TreeHugger Robot
2b0bd66d5b
Merge "Show progress user unlocking is delayed" into nyc-mr1-dev
2016-08-02 19:26:41 +00:00
TreeHugger Robot
6490032550
Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev
2016-08-02 19:07:48 +00:00
Jorim Jaggi
984079442f
Show progress user unlocking is delayed
...
Sometimes it takes a while to unlock a user, for example, after an OTA.
In these cases, we show a progress bar in FallbackHome so the user knows
that something is happening.
Fixes: 30213213
Change-Id: Ie36a9b3107c32ff46a8890818d1f26ccf310ee6c
2016-08-02 20:02:42 +02:00
Tony Mak
9ba765b875
Hide redundant restrictions
...
Change-Id: Id9b8ec6f045632a87092b4dccef5f7ff73a327cc
Fix: 30109035
2016-08-02 17:09:53 +01:00
TreeHugger Robot
1e7798c577
Merge "Futureproof trusted credentials for multiple profiles"
2016-08-02 12:29:30 +00:00
Robin Lee
232f057df0
Futureproof trusted credentials for multiple profiles
...
Made use of the shiny LayoutTransition.CHANGING animations. Now it's a
little more obvious where things are going when tapping a header.
Future work: maybe show the usernames / user icons in there too? This
could get complicated, and it'll need to be done everywhere at once.
Change-Id: Id7396235abe6218d591d16db91af0f56a83a7bcd
Fix: 28310002
2016-08-02 12:12:14 +01:00
Bill Yi
937f91a247
Import translations. DO NOT MERGE am: de26061dc9 -s ours am: ac66787cd0 -s ours
...
am: f36e1d16be
2016-08-02 03:15:27 +00:00
Bill Yi
f36e1d16be
Import translations. DO NOT MERGE am: de26061dc9 -s ours
...
am: ac66787cd0
2016-08-02 02:21:10 +00:00
Bill Yi
ac66787cd0
Import translations. DO NOT MERGE
...
am: de26061dc9
2016-08-02 02:06:45 +00:00
TreeHugger Robot
1ca37fd879
Merge "Import translations. DO NOT MERGE"
2016-08-02 01:55:01 +00:00
Doris Ling
fabb1c4e40
Merge "Fix caption text being cut off when text size is set to very large."
2016-08-02 01:39:43 +00:00
TreeHugger Robot
90f3d52faf
Merge "Keep classes/fields only used via reflection"
2016-08-02 01:19:03 +00:00
Bill Yi
de26061dc9
Import translations. DO NOT MERGE
...
Change-Id: Icbf8d39b372bdfad0e5dd5eec9753a8725ec0c90
Auto-generated-cl: translation import
2016-08-01 17:43:36 -07:00
Bill Yi
85c180f23e
Import translations. DO NOT MERGE
...
Change-Id: I4ddcf9511c4624589a0a73cf14a51727d5466b86
Auto-generated-cl: translation import
2016-08-01 17:36:04 -07:00
Doris Ling
e797d91c83
Fix caption text being cut off when text size is set to very large.
...
In landscape mode, the caption preview height is set to 100dp. When
running in tablet and setting the caption text size to Very large, 100dp
is not enough to render the complete text with all the paddings defined.
Increasing the preview height to make enough room to display the caption
text.
Change-Id: Ia45c01a16eb1829d569d71648de398d48a7e4618
Fixes: 29125201
2016-08-01 17:04:38 -07:00
Justin Klaassen
ab7041107f
Keep classes/fields only used via reflection
...
Bug: 30355720
Change-Id: I9c8325a0b42cda5beeb8dfe76bde46afd2bec727
2016-08-01 23:47:53 +00:00
Fan Zhang
0ccfd66bbe
Merge "Set correct flag when enabling listener for conditions." into nyc-mr1-dev am: dccd2544b3 am: 9c967df320
...
am: 503a155438
2016-08-01 22:27:07 +00:00
Fan Zhang
81786acf49
Set correct flag when enabling listener for conditions. am: 0aebaf1556 am: 38cdd42efa
...
am: 939d5773ff
2016-08-01 22:27:06 +00:00
