Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
516,891 Commits 3 Branches 0 Tags
482802a76a8a902ae0c19fa178568694d8c61b59
Commit Graph

5642 Commits

Author SHA1 Message Date
Curtis Belmonte
5b3f78d36d Merge "Use inclusive language in framework core test APKs" am: a715792f5c am: 6b1799323e am: 13d34cbd5e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: Iead939405084a422f9b8965bd65fd12ecb4a9e92
 2020-07-31 21:26:00 +00:00
Curtis Belmonte
13d34cbd5e Merge "Use inclusive language in framework core test APKs" am: a715792f5c am: 6b1799323e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1378656

Change-Id: If39f0b52f464d491dbf78ed145bdd2c357f53f67
 2020-07-31 21:13:31 +00:00
Curtis Belmonte
a715792f5c Merge "Use inclusive language in framework core test APKs" 2020-07-31 20:29:53 +00:00
Treehugger Robot
ca6dff59f0 Merge "Use inclusive language." am: 1222133ffc am: 19dfb7bf93 am: e1ee546876 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377140

Change-Id: I1d3477f5cf8bd3381680a299782fdf92550df13b
 2020-07-30 08:23:51 +00:00
Treehugger Robot
e1ee546876 Merge "Use inclusive language." am: 1222133ffc am: 19dfb7bf93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1377140

Change-Id: I2834e1199c4c436f761af170feb743105e5221ae
 2020-07-30 08:08:44 +00:00
Treehugger Robot
1222133ffc Merge "Use inclusive language." 2020-07-30 07:39:38 +00:00
Curtis Belmonte
074458830e Use inclusive language in framework core test APKs 
Update language to comply with Android's inclusive language guidance

See https://source.android.com/setup/contribute/respectful-code for reference

Test: atest FrameworksCoreTests
Bug: 161896447
Change-Id: I71bd3e0033829378e6c19864dd084d7b322aca68
 2020-07-29 13:42:55 -07:00
Yifan Hong
6afecabc9e Use inclusive language. 
Test: pass
Change-Id: I1eba25388dfb3bef7bf05c157da348a11ca258a0
 2020-07-29 11:28:03 -07:00
Leon Scroggins
fada7acad0 Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61 am: 53ee2070ed 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370379

Change-Id: Ib2c32683f2579700350304b5273cbe3977e1adca
 2020-07-23 14:12:14 +00:00
Leon Scroggins
53ee2070ed Merge "Update graphics language to comply with Android’s inclusive language guidance" am: da4dc882af am: a97e560c61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370379

Change-Id: I5d853a84c0fe1550d86d0f948f76e532af42e073
 2020-07-23 13:56:41 +00:00
Leon Scroggins III
f663182d52 Update graphics language to comply with Android’s inclusive language guidance 
Bug: 161896447
Test: make

See https://source.android.com/setup/contribute/respectful-code for reference

Change-Id: I57b81fb5fd2177fbf96f9cc900097f7da1955fca
 2020-07-22 13:00:12 -04:00
vichang
afbfec08c7 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 am: da5838aa43 am: 36a3657be8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: I2f8a2bf66f5acac30b57140d6304646826d3c7c2
 2020-07-21 17:12:09 +00:00
vichang
36a3657be8 Merge "Use DateFormatSymbols directly instead of using LocaleData" am: 3bd9f08ae5 am: da5838aa43 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364767

Change-Id: I8fbfc4e551396b32c1aafab4aa750af1baa7c827
 2020-07-21 16:56:31 +00:00
vichang
ba3ebf0844 Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 am: 70862e266e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: I6b721c9fbac71bdc75ce2682f06d67f8916e25a9
 2020-07-21 09:53:28 +00:00
vichang
d7b8bede26 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee am: 85c56c1fa4 am: c675c3e826 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I3634fc38644ec7f48d5ee1e0b016e7411e999d5e
 2020-07-21 09:53:07 +00:00
vichang
70862e266e Merge "Remove the duplicated constant declaration in DateUtilsBridge" am: 3db0441e5c am: c52a84acf3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364765

Change-Id: Iab8475912ecf95b90d24eb5b2dc9165e4442a347
 2020-07-21 09:36:43 +00:00
vichang
c675c3e826 Merge changes from topic "DateIntervalFormat" am: 6e706c4cee am: 85c56c1fa4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365636

Change-Id: I6ff83f882fac3cf045defe4aa297495d3b011ddc
 2020-07-21 09:36:18 +00:00
Wale Ogunwale
faa7063aaa Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: f4fb8c1457 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: Ib618bddd560576fe1d7bbf1b6a78f70b4733eac9
 2020-07-21 01:41:57 +00:00
Wale Ogunwale
56e2b90936 Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: I0707a8ab55eb3aa96b2f3107648db67f848256df
 2020-07-21 01:24:53 +00:00
Wale Ogunwale
f4fb8c1457 Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12167896

Change-Id: Idda9ab4bb5dddc617eb61e4b3355567627ca6fd3
 2020-07-21 01:24:31 +00:00
Wale Ogunwale
309cfa3431 Merge "Prevent exception when surrounding text retrieval" into rvc-dev 2020-07-21 01:03:03 +00:00
Victor Chang
c744bd5f64 Use DateFormatSymbols directly instead of using LocaleData 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: Id5d70328ab146d439ed45135e0fa9d1b9cc95257
 2020-07-20 21:09:40 +01:00
Victor Chang
6a691eeec7 Remove the duplicated constant declaration in DateUtilsBridge 
Bug: 160606356
Test: m droid FrameworksCoreTests
Change-Id: Ifa79b2a29c6fc0c767337efe569da2d2ba29f959
 2020-07-20 21:09:40 +01:00
Victor Chang
3a3a8ada42 Make a copy of DateIntervalFormat from libcore - part 2 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I4c4253c707211f2a5ee0a11da107ab1dd6c4fab8
 2020-07-20 21:09:40 +01:00
Wilson Wu
0ebe70cb0f Prevent exception when surrounding text retrieval 
We use same reference from TextView to set the initial
surrounding text. The actual surrounding text may be
modified before retrieval since the mSurroundingText
is mutable. Use a copy of subText should avoid this
concurrent issue.

Bug: 160390184
Test: atest FrameworksCoreTests:EditorInfoTest
Change-Id: I6082a4cae2fcdc4c529dc14e2e5e7a45ab1aae4d
 2020-07-18 00:51:47 +08:00
Victor Chang
8ee3807a01 Make a copy of DateIntervalFormat from libcore 
It allows the removal of @CorePlatformApi in libcore.icu

Bug: 160606356
Test: n/a
Change-Id: Id0ed2d212b6cd84ff73edc70794e002ea5f63cd0
 2020-07-16 16:23:58 +01:00
Peter Wang
772c538d6d Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a am: 098fb8606a am: 4c7b55f086 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082

Change-Id: I03fc202f07fdd37a13252e6ec67e06de265a8246
 2020-07-16 09:45:14 +00:00
Peter Wang
4c7b55f086 Merge "Add a null check for EuiccProfileInfo access rules at creation" am: 65f6068c8a am: 098fb8606a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364082

Change-Id: Icca17231fe6b7386e18b9c44a22eebdca2336f24
 2020-07-16 09:34:33 +00:00
Peter Wang
548f34b47d Add a null check for EuiccProfileInfo access rules at creation 
Bug: 158780604
Fix: 158780604
Test: Build
Change-Id: I6432499309115c7ca29f4704e0f5cfc871eb4d00
Merged-In: I6432499309115c7ca29f4704e0f5cfc871eb4d00
 2020-07-15 17:34:27 -07:00
Wale Ogunwale
2cff1f32fc Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f am: 2346053033 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12157384

Change-Id: I13f507d5693fdac232c8b6b29dda775358a90658
 2020-07-15 14:19:44 +00:00
Wale Ogunwale
2346053033 Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12157384

Change-Id: I82021bdc4f4d737feda4a20febf532db9fa1c850
 2020-07-15 14:03:48 +00:00
Wale Ogunwale
1813474cc9 Merge "Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN" into rvc-dev am: 0b237bb06f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12157384

Change-Id: Ie7bbdf01416680dac708e47347d86718aa22336c
 2020-07-15 14:03:34 +00:00
Tiger Huang
0f310bdec8 Remove Type.statusBars from compatInsetsTypes if FLAG_FULLSCREEN 
In the legacy layout world, if a window has FLAG_FULLSCREEN, then its
stable insets won't be affected by status bar. This CL makes the layout
logic compatible.

Fix: 160593171
Test: InsetsStateTest InsetsControllerTest ImeInsetsSourceConsumerTest
Change-Id: I59717e699470273e2462c1ad864e00bb9a126677
 2020-07-15 19:00:19 +08:00
vichang
fe1600c0db Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055 am: f5ed148053 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356708

Change-Id: I41add09b9ba08cde5a6dd1a38e59a33dcaaacbcd
 2020-07-13 10:35:59 +00:00
vichang
f5ed148053 Merge changes from topic "DateUtilsBridge" am: 59d12aa8bd am: f65666d055 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356708

Change-Id: Idd5d71f2d6b787ddbece60746c97dd2713ecc7cc
 2020-07-13 10:22:38 +00:00
vichang
59d12aa8bd Merge changes from topic "DateUtilsBridge" 
* changes:
  Move/Copy some libcore.icu classes to android.text.format
  Copy some libcore.icu classes to android.text.format
 2020-07-13 10:02:16 +00:00
vichang
13121a763b Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22 am: 3b25f55042 am: 8a202538bc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: Ibf7d65359e2cc129fbf8e1366dfa80f23ae80c04
 2020-07-13 02:31:53 +00:00
vichang
8a202538bc Merge "Remove libcore.icu.ICU usage in android.text.format.DateFormat" am: ec71624f22 am: 3b25f55042 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1355737

Change-Id: Ibc2b1561f316afe2371d9549190a0c328a180141
 2020-07-13 02:31:18 +00:00
Nikita Dubrovsky
349e19d00c Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 am: 59eed075de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: I603d505bee321a97b4d449c3789c63fe523c4814
 2020-07-11 23:31:08 +00:00
Nikita Dubrovsky
40c895bcb2 Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: Iee182d6e9c28ef8ad310d673bb2500752be61674
 2020-07-11 23:19:44 +00:00
Nikita Dubrovsky
59eed075de Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev am: e50d6658b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12099133

Change-Id: I3a86a03b24ea84c2383af45b61d4e098f1f8b8ed
 2020-07-11 23:19:30 +00:00
Nikita Dubrovsky
e50d6658b6 Merge "Remove flaky test for cursor drag from presubmit" into rvc-dev 2020-07-11 23:08:10 +00:00
Victor Chang
5e348b2a28 Move/Copy some libcore.icu classes to android.text.format 
Bug: 160606356
Test: atest FrameworksCoreTests:android.text.format
Change-Id: I5a3e954419e8bd282ec5dd057b241c3572be6831
 2020-07-10 18:00:29 +00:00
Tiger Huang
3516329349 Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a797421 am: 8e4707ae80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108428

Change-Id: I54ea63439c9ccab8e5872243fa6fad8970ea2ef4
 2020-07-10 14:19:41 +00:00
Tiger Huang
1568d9181a Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a797421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108428

Change-Id: I3013d5d486b468ed7fedcedbc60cfc2bb61c233a
 2020-07-10 14:03:50 +00:00
Tiger Huang
8e4707ae80 Merge "Update requested state by comparing with source consumer" into rvc-dev am: 894a797421 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108428

Change-Id: I3de26ac30237f76cd71e0e8639cc4025b754f6ef
 2020-07-10 14:03:48 +00:00
Tiger Huang
894a797421 Merge "Update requested state by comparing with source consumer" into rvc-dev 2020-07-10 13:51:37 +00:00
Tiger Huang
ff06666dba Update requested state by comparing with source consumer 
If the local state and mLastDispatchedState are the same, the logic in
onStateChanged will skip updating the requested state. This could be an
issue, for example, a new focused window requested to hide status bar,
but status bar has already been hidden by the previous focused window,
so the new focused window will never send the requested state to server.
This can easily happen when an immersive activity is re-created due to
the configuration change.

This CL updates the requested state if any visibility within it is not
the same as the requested visibility of the source consumer, while
receiving controls.

Fix: 160854328
Test: atest InsetsControllerTest
Test: Swipe to show transient bars after rotating an immersive activity
Change-Id: I5d9acb1b59252fa80e66070db86b2555764588da
 2020-07-10 18:04:57 +08:00
Adrian Roos
2b8b39ec24 Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev am: 895a2e626a am: 2f07569650 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12070682

Change-Id: Id91802e75d496b824c22d53bb2ee86868cb80d79
 2020-07-09 17:24:23 +00:00
Adrian Roos
2f07569650 Merge "Fix IME flicker: move hiding the surface into the control target" into rvc-dev am: 895a2e626a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12070682

Change-Id: Ib984a4bc34f0527c809de35919340019a04b017a
 2020-07-09 17:12:41 +00:00